feat: 部门物品报废 1、分发单选择增加校验 2、明细列表字段对接

石广澎

2023-12-02 f7163108fef21286a2b447f1958ee3204d7854d0

 consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java

@@ -3,6 +3,7 @@
import cn.hutool.core.convert.Convert;
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.DepFormScrappedGoodsParam;
import com.consum.base.pojo.DepFormScrappedModelParam;
@@ -15,7 +16,6 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import com.walker.web.ResponseValue;
@@ -60,7 +60,7 @@
        //1.新增报废单记录
        DepFormScrapped lDeptFormScrapped = new DepFormScrapped();
        //报废单id
        long lWhFormScrappedId = NumberGenerator.getLongSequenceNumber();
        long lWhFormScrappedId = IdUtil.generateId();
        lDeptFormScrapped.setId(lWhFormScrappedId);
        lDeptFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
        lDeptFormScrapped.setProcureDoc(param.getProcureDoc());
@@ -100,7 +100,7 @@

        for (DepFormScrappedGoodsParam depFormScrappedGoodsParam : scrappedGoodsInfo) {
            DepFormScrappedGoods depFormScrappedGoods = new DepFormScrappedGoods();
            depFormScrappedGoods.setId(NumberGenerator.getLongSequenceNumber());
            depFormScrappedGoods.setId(IdUtil.generateId());
            depFormScrappedGoods.setDepFormScrappedId(lWhFormScrappedId);
            depFormScrappedGoods.setBaseGoodsTemplateId(depFormScrappedGoodsParam.getBaseGoodsTemplateId());
            depFormScrappedGoods.setBaseGoodsTemplateName(depFormScrappedGoodsParam.getGoodsTemplateName());
@@ -138,7 +138,7 @@

            for (DepFormScrappedModelParam depFormScrappedModelParam : modelList) {
                DepFormScrappedModel depFormScrappedModel = new DepFormScrappedModel();
                depFormScrappedModel.setId(NumberGenerator.getLongSequenceNumber());
                depFormScrappedModel.setId(IdUtil.generateId());
                depFormScrappedModel.setDepFormScrappedId(lWhFormScrappedId);
                depFormScrappedModel.setDepFormScrappedGoodsId(depFormScrappedGoods.getId());
                //报废原因
@@ -244,6 +244,7 @@

        //2.查询报废单物品
        DepFormScrappedGoods goodsQuery = new DepFormScrappedGoods();
        goodsQuery.setDepFormScrappedId(id);
        List<DepFormScrappedGoods> formScrappedGoodsList = select(goodsQuery);
        List<Map> goodsList = new ArrayList<>();
        for (DepFormScrappedGoods scrappedGoods : formScrappedGoodsList) {