| src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/model/DetlDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/nc/mapper/NccJcRyWmsMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -562,18 +562,13 @@ orderDetlService.insert(orderDetl2); log.info("插入-------------------------{}",orderDetl2.getOrderNo()); } else { orderDetl = orderDetlService.selectItem(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), null, orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3()); OrderDetl orderDetl2 = new OrderDetl(); orderDetl2.sync(orderDetl); if (orderDetl.getAnfme() <= wrkDetl.getAnfme()) { orderDetlService.deleteById(orderDetl.getId()); } else { orderDetl.setAnfme(orderDetl.getAnfme() - wrkDetl.getAnfme()); orderDetlService.updateById(orderDetl); OrderDetl orderDetl2 = orderDetlService.selectItem(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), null, orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3()); if (orderDetl2.getAnfme() <= wrkDetl.getAnfme()) { orderDetlService.deleteById(orderDetl2.getId()); } orderDetl2.setQty(orderDetl.getQty() + wrkDetl.getAnfme()); orderDetl2.setBatch(wrkDetl.getBatch()); orderDetlService.updateById(orderDetl2); orderDetl.setQty(orderDetl.getQty() + wrkDetl.getAnfme()); orderDetl.setBatch(wrkDetl.getBatch()); orderDetlService.updateById(orderDetl); } boolean b = orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme()); if (!b) { src/main/java/com/zy/common/model/DetlDto.java
@@ -36,6 +36,9 @@ private Double anfme; public DetlDto() { }
@@ -1,7 +1,9 @@ package com.zy.nc.mapper; import com.zy.nc.entity.NccJcRyWms; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.nc.entity.NccJcRyWms; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; /** * @author ZY @@ -9,6 +11,8 @@ * @createDate 2025-05-13 17:50:58 * @Entity com.zy.nc.entity.NccJcRyWms */ @Mapper @Repository public interface NccJcRyWmsMapper extends BaseMapper<NccJcRyWms> {
@@ -21,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; @@ -83,6 +84,7 @@ /** * @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)); @@ -96,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)); @@ -105,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)); @@ -114,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)); @@ -123,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)); @@ -133,6 +138,7 @@ 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)); @@ -157,6 +163,7 @@ 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)); @@ -166,15 +173,17 @@ 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())); 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()); @@ -182,18 +191,20 @@ } else { user.setUsername(nccJcRyWms.getRybm()); user.setNickname(nccJcRyWms.getRymc()); user.setMobile(nccJcRyWms.getRybm()); user.setRoleId(12L); user.setStatus(1); userService.updateById(user); } nccJcRyWms.setWmsFlag(1); nccJcRyWmsService.updateById(nccJcRyWms); nccJcRyWmsService.update(nccJcRyWms, new EntityWrapper<NccJcRyWms>().eq("rybm", nccJcRyWms.getRybm())); log.info("NccJcRyWms数据:{}", JSONObject.toJSON(nccJcRyWms)); } 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)); @@ -246,6 +257,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)); @@ -256,7 +268,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)); src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.ArrayList; @@ -62,6 +63,7 @@ * * @return */ @Transactional public ReturnT<String> start1(List<NccSaleXsfhmxWms> wmsFlag) { try { OpenOrderPakoutParam param = new OpenOrderPakoutParam(); @@ -98,6 +100,7 @@ * * @return */ @Transactional public ReturnT<String> start1In(List<NccSaleXsfhmxWms> wmsFlag) { try { OpenOrderPakinParam param = new OpenOrderPakinParam(); @@ -134,6 +137,7 @@ * * @return */ @Transactional public ReturnT<String> start2In(List<NccScZkmxbWms> wmsFlag) { try { OpenOrderPakinParam param = new OpenOrderPakinParam(); @@ -171,6 +175,7 @@ * * @return */ @Transactional public ReturnT<String> start2Out(List<NccScZkmxbWms> wmsFlag) { try { OpenOrderPakoutParam param = new OpenOrderPakoutParam(); @@ -207,6 +212,7 @@ * * @return */ @Transactional public ReturnT<String> start3(List<NccCgCgdhdWms> wmsFlag) { try { OpenOrderPakinParam param = new OpenOrderPakinParam(); @@ -245,6 +251,7 @@ * * @return */ @Transactional public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) { try { InventoryCheckOrder param = new InventoryCheckOrder(); @@ -285,6 +292,7 @@ * * @return */ @Transactional public ReturnT<String> start5(List<NccSaleDbddWms> wmsFlag) { try { OpenOrderPakoutParam param = new OpenOrderPakoutParam();
