低值易耗品管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
haoyahui
2023-11-22 9834dbff448908d2008d8c52a2544aad00c099b1 
 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java


@@ -11,27 +11,9 @@


import com.consum.base.pojo.LWhFormProcureParam;


import com.consum.base.pojo.LWhProcureModelParam;


import com.consum.base.pojo.query.FormProcureQry;


import com.consum.base.pojo.response.FormProcureVO;


import com.consum.base.pojo.response.FromProcureTemplateInfoVO;


import com.consum.base.pojo.response.GoodsModelVO;


import com.consum.base.pojo.response.LWhFormProcureExtendVO;


import com.consum.base.pojo.response.LWhFormProcureGoodsVO;


import com.consum.base.service.BaseGoodsTemplateServiceImpl;


import com.consum.base.service.BaseWarehouseServiceImpl;


import com.consum.base.service.FinSysTenantServiceImpl;


import com.consum.base.service.LOrgSupplierServiceImpl;


import com.consum.base.service.LWhFormProcureCoreService;


import com.consum.base.service.LWhFormProcureGoodsService;


import com.consum.base.service.LWhFormProcureService;


import com.consum.base.service.LWhGoodsService;


import com.consum.base.service.LWhProcureModelService;


import com.consum.model.po.BaseGoodsTemplate;


import com.consum.model.po.BaseWarehouse;


import com.consum.model.po.FinSysTenantUser;


import com.consum.model.po.LOrgSupplier;


import com.consum.model.po.LWhFormProcure;


import com.consum.model.po.LWhFormProcureGoods;


import com.consum.model.po.LWhProcureModel;


import com.consum.base.pojo.response.*;


import com.consum.base.service.*;


import com.consum.model.po.*;


import com.iplatform.model.po.S_user_core;


import com.walker.db.page.GenericPager;


import com.walker.infrastructure.utils.CollectionUtils;


@@ -41,22 +23,13 @@


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import java.lang.reflect.Field;


import java.util.ArrayList;


import java.util.HashMap;


import java.util.HashSet;


import java.util.List;


import java.util.Map;


import java.util.Set;


import javax.annotation.Resource;


import org.apache.commons.compress.utils.Lists;


import org.springframework.beans.BeanUtils;


import org.springframework.web.bind.annotation.DeleteMapping;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import java.lang.reflect.Field;


import java.util.*;




/**


 * @ClassName LWhFormProcureController


@@ -166,7 +139,7 @@


                }


                String modelName = (String) tempGoodsInfo.get("modelname");


                // 查询型号库存


                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);


                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);


                LWhProcureModel model = new LWhProcureModel();


                model.setId(NumberGenerator.getLongSequenceNumber());


                model.setFromProcureGoodsId(fromProcureGoodsId);


@@ -178,6 +151,7 @@


                model.setCounts(counts);


                model.setWorehouseCount(goodsModelNum);


                model.setSupplier(supplier);


                model.setTotalAmount(price*counts);


                procureModelList.add(model);


            }


            procureGoodList.add(procureGood);


@@ -228,7 +202,12 @@


        if (currentUser == null) {


            return ResponseValue.error("登录用户信息不存在");


        }




        /*当前登录人只能看到自己机构下的列表*/


        FinSysTenantUser sysInfo = this.getSysInfo();


        String tenantId = sysInfo.getTenantId();


        if (param.getAgencyId() == null) {


            param.setAgencyId(Long.valueOf(tenantId));


        }


        GenericPager genericPager = lWhFormProcureService.queryFormProcureList(param);


        List<LWhFormProcure> data = genericPager.getDatas();


        ArrayList<FormProcureVO> result = new ArrayList<>();