#入库逻辑变更

Junjie

2025-09-04 193c3204f7f998df4d603df202dbea88a3074585

 src/main/java/com/zy/nc/task/handler/BaseDataHandler.java

@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.zy.asrs.entity.StoreType;
import com.zy.asrs.entity.Tag;
import com.zy.asrs.entity.param.MatSyncParam;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.StoreTypeService;
import com.zy.asrs.service.TagService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -19,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
@@ -72,12 +75,16 @@
    @Autowired
    private UserService userService;

    @Autowired
    private StoreTypeService storeTypeService;

    @Value("${NYNC.pageSize}")
    private Integer pageSize;

    /**
     * @return
     */
    @Transactional
    public ReturnT<String> start1() {
        Page<NccBdCustomerWms> page = new Page<>(1, pageSize);
        Page<NccBdCustomerWms> wmsFlag = nccBdCustomerWmsService.selectPage(page, new EntityWrapper<NccBdCustomerWms>().ne("wms_flag", 1));
@@ -91,6 +98,7 @@
    /**
     * @return
     */
    @Transactional
    public ReturnT<String> start2() {
        Page<NccCgCgdhdWms> page = new Page<>(1, pageSize);
        Page<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectPage(page, new EntityWrapper<NccCgCgdhdWms>().ne("wms_flag", 1));
@@ -100,6 +108,7 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start3() {
        Page<NccCkPddWms> page = new Page<>(1, pageSize);
        Page<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectPage(page, new EntityWrapper<NccCkPddWms>().ne("wms_flag", 1));
@@ -109,6 +118,7 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start4() {
        Page<NccJcBmWms> page = new Page<>(1, pageSize);
        Page<NccJcBmWms> wmsFlag = nccJcBmWmsService.selectPage(page, new EntityWrapper<NccJcBmWms>().ne("wms_flag", 1));
@@ -118,7 +128,7 @@
        return SUCCESS;
    }


    @Transactional
    public ReturnT<String> start5() {
        Page<NccJcCkhw> page = new Page<>(1, pageSize);
        Page<NccJcCkhw> wmsFlag = nccJcCkhwService.selectPage(page, new EntityWrapper<NccJcCkhw>().ne("wms_flag", 1));
@@ -128,15 +138,35 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start6() {
        Page<NccJcCkWms> page = new Page<>(1, pageSize);
        Page<NccJcCkWms> wmsFlag = nccJcCkWmsService.selectPage(page, new EntityWrapper<NccJcCkWms>().ne("wms_flag", 1));
        for (NccJcCkWms nccJcCkWms : wmsFlag.getRecords()) {
            log.info("NccJcCkWms数据:{}", JSONObject.toJSON(nccJcCkWms));
            StoreType storeType = storeTypeService.selectById(nccJcCkWms.getCode());
            if (storeType == null) {
                storeType = new StoreType();
                storeType.setStoreName(nccJcCkWms.getName());
                storeType.setStatus(1);
                storeType.setStoreId(nccJcCkWms.getCode());
                storeType.setCreateBy(1L);
                storeType.setCreateTime(new Date());
                storeType.setDepartmentId((Cools.isEmpty(nccJcCkWms.getDef3()) || "~".equals(nccJcCkWms.getDef3())) ? null : nccJcCkWms.getDef3());
                //storeType.setDepartment();
                storeTypeService.insert(storeType);
            } else {
                storeType.setStoreName(nccJcCkWms.getName());
                storeType.setDepartmentId((Cools.isEmpty(nccJcCkWms.getDef3()) || "~".equals(nccJcCkWms.getDef3())) ? null : nccJcCkWms.getDef3());
                storeTypeService.updateById(storeType);
            }
            nccJcCkWms.setWmsFlag(1);
            nccJcCkWmsService.update(nccJcCkWms, new EntityWrapper<NccJcCkWms>().eq("code", nccJcCkWms.getCode()));
        }
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start7() {
        Page<NccJcQilibcBarcodeflowWms> page = new Page<>(1, pageSize);
        Page<NccJcQilibcBarcodeflowWms> wmsFlag = nccJcQilibcBarcodeflowWmsService.selectPage(page, new EntityWrapper<NccJcQilibcBarcodeflowWms>().ne("wms_flag", 1));
@@ -146,25 +176,37 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start8() {
        Page<NccJcRyWms> page = new Page<>(1, pageSize);
        Page<NccJcRyWms> wmsFlag = nccJcRyWmsService.selectPage(page, new EntityWrapper<NccJcRyWms>().ne("wms_flag", 1).eq("sszzmc", "浙江福莱新材料股份有限公司烟台分公司"));
        Page<NccJcRyWms> wmsFlag = nccJcRyWmsService.selectPage(page, new EntityWrapper<NccJcRyWms>().ne("wms_flag", 1).eq("sszzbm", "FYT"));
        for (NccJcRyWms nccJcRyWms : wmsFlag.getRecords()) {
            User user = userService.selectOne(new EntityWrapper<User>().eq("username", nccJcRyWms.getRybm()));
            nccJcRyWms.setWmsFlag(1);
            if (user == null) {
                user = new User();
                user.setUsername(nccJcRyWms.getRybm());
                user.setNickname(nccJcRyWms.getRymc());
                user.setMobile(nccJcRyWms.getRybm());
                user.setRoleId(12L);
                user.setStatus(1);
                user.setCreateTime(new Date());
                userService.insert(user);
            } else {
                user.setUsername(nccJcRyWms.getRybm());
                user.setNickname(nccJcRyWms.getRymc());
                user.setMobile(nccJcRyWms.getRybm());
                user.setStatus(1);
                userService.updateById(user);
            }
            nccJcRyWms.setWmsFlag(1);
            nccJcRyWmsService.update(nccJcRyWms, new EntityWrapper<NccJcRyWms>().eq("rybm", nccJcRyWms.getRybm()));
            log.info("NccJcRyWms数据:{}", JSONObject.toJSON(nccJcRyWms));
        }
        nccJcRyWmsService.updateBatchById(wmsFlag.getRecords());

        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start9() {
        Page<NccJcWlflWms> page = new Page<>(1, pageSize);
        Page<NccJcWlflWms> wmsFlag = nccJcWlflWmsService.selectPage(page, new EntityWrapper<NccJcWlflWms>().ne("wms_flag", 1));
@@ -217,6 +259,7 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start10() {
        Page<NccOrgCorpWms> page = new Page<>(1, pageSize);
        Page<NccOrgCorpWms> wmsFlag = nccOrgCorpWmsService.selectPage(page, new EntityWrapper<NccOrgCorpWms>().ne("wms_flag", 1));
@@ -227,7 +270,7 @@
        return SUCCESS;
    }


    @Transactional
    public ReturnT<String> start13() {
        Page<VGetBdMaterial> page = new Page<>(1, pageSize);
        Page<VGetBdMaterial> wmsFlag = vGetBdMaterialService.selectPage(page, new EntityWrapper<VGetBdMaterial>().ne("wms_flag", 1));
@@ -245,9 +288,11 @@
            matParam.setSpecs(vGetBdMaterial.get规格());
            matParam.setModel(vGetBdMaterial.get型号());
            matParam.setUnit(vGetBdMaterial.get主单位());
            matParam.setManu(vGetBdMaterial.get辅单位());
            matParam.setMemo(vGetBdMaterial.get备注());
            matParam.setGroupCode(vGetBdMaterial.get存货分类编码());
            matParam.setGroupName(vGetBdMaterial.get存货分类名称());
            matParam.setSku(vGetBdMaterial.get物料简称u8旧品名());
            matParam.setOrigin(vGetBdMaterial.get主辅换算比());
            matParam.setGroupCode(priTag.getId() + "");
            matDetails.add(matParam);
        }
        if (!matDetails.isEmpty()) {
@@ -256,7 +301,9 @@
            for (VGetBdMaterial vGetBdMaterial : wmsFlag.getRecords()) {
                vGetBdMaterial.setWmsFlag(1);
            }
            vGetBdMaterialService.updateBatchById(wmsFlag.getRecords());
            for (VGetBdMaterial vGetBdMaterial : wmsFlag.getRecords()) {
                vGetBdMaterialService.update(vGetBdMaterial, new EntityWrapper<VGetBdMaterial>().eq("物料编码", vGetBdMaterial.get物料编码()));
            }
        }
        return SUCCESS;
    }