| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/third/entity/ExdInstockTarget.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/third/task/BaseDataScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/third/task/handler/BaseDataHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,7 +4,10 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.common.*; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.SnowflakeIdWorker; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.CombParam; @@ -14,7 +17,6 @@ import com.zy.asrs.mapper.ManLocDetlMapper; import com.zy.asrs.service.*; import com.zy.asrs.utils.MatUtils; import com.zy.common.CodeRes; import com.zy.common.constant.MesConstant; import com.zy.common.entity.Parameter; import com.zy.common.model.DetlDto; @@ -230,6 +232,8 @@ waitPakin.setAppeTime(now); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); waitPakin.setBrand(param.getCk());//仓库 waitPakin.setInspect(param.isType() ? 1 : 0); if(i==1){ // 0:不需要补空托盘 // 1:小托盘 @@ -366,7 +370,9 @@ // 添加明细 for (WrkDetl wrkDetl : list) { if (wrkDetl.getAnfme() == 0.0D) { continue; } if (wrkDetl.getAnfme() == 0.0D) { continue; } // todo 盘点记录、保存调整记录 String orderNo = wrkDetl.getOrderNo(); Mat mat = matService.selectByMatnr(wrkDetl.getMatnr()); @@ -480,7 +486,9 @@ response, success ); } catch (Exception e) { log.error("", e); } } catch (Exception e) { log.error("", e); } } } src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.DateUtils; import com.zy.asrs.entity.*; import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; @@ -444,7 +443,11 @@ private void write(WrkMast wrkMast, List<WrkDetl> wrkDetls) { ExdInstockTarget exdInstockTarge; int i = -1; for (WrkDetl wrkDetl : wrkDetls) { if (Cools.isEmpty(wrkDetl.getOrderNo()) && !Cools.isEmpty(wrkDetl.getInspect()) && wrkDetl.getInspect() == 1) { continue; } ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getBatch()); exdInstockTarge = new ExdInstockTarget(); exdInstockTarge.setFtrantype(21); @@ -454,6 +457,17 @@ exdInstockTarge.setFqty(wrkDetl.getAnfme()); exdInstockTarge.setFbatchno(bacode.getBatchno()); exdInstockTarge.setFsourcebillno(bacode.getIcmono()); exdInstockTarge.setFsourcetrantype(85); exdInstockTarge.setFentryid(i); exdInstockTarge.setFsmanagerid(Integer.valueOf(wrkDetl.getColor())); exdInstockTarge.setFfmanagerid(Integer.valueOf(wrkDetl.getColor())); exdInstockTarge.setFbillerid(Integer.valueOf(wrkDetl.getColor())); exdInstockTarge.setFitemid(Integer.parseInt(wrkDetl.getSku())); exdInstockTarge.setFsourceentryid(i); exdInstockTarge.setFdcspid(wrkMast.getLocNo()); exdInstockTarge.setFdcstockid(wrkDetl.getBrand()); exdInstockTarge.setBarcode(wrkDetl.getBatch()); exdInstockTarge.setGross(bacode.getGross()); @@ -464,6 +478,7 @@ exdInstockTarge.setWritor("WMS"); exdInstockTarge.setStatus(0); exdInstockTargetService.insert(exdInstockTarge); i++; } } src/main/java/com/zy/third/entity/ExdInstockTarget.java
@@ -129,12 +129,12 @@ /** * */ private Integer fdcspid; private String fdcspid; /** * */ private Integer fdcstockid; private String fdcstockid; /** * src/main/java/com/zy/third/task/BaseDataScheduler.java
@@ -61,7 +61,7 @@ /** * 读取物料信息 */ @Scheduled(cron = "0/30 * * * * ? ") @Scheduled(cron = "0/3 * * * * ? ") public void readMat() { log.info("读取物料信息"); List<ExdMaterial> exdMaterials = exdMaterialMapper.listAll(); src/main/java/com/zy/third/task/handler/BaseDataHandler.java
@@ -56,6 +56,7 @@ mat.setMatnr(exdMaterial.getFnumber()); mat.setMaktx(exdMaterial.getFname()); mat.setSpecs(exdMaterial.getFmodel()); mat.setSku(exdMaterial.getId()); mat.setTagId(tagService.getTop().getId()); mat.setStatus(1); mat.setCreateTime(new Date());