| src/main/java/com/zy/asrs/controller/MatController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/TaskDetlLog.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/locCache/locCache.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/mat/mat.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/MatController.java
@@ -188,7 +188,9 @@ if (pakinCount > 0 || wrkCount > 0 || taskCount > 0) { throw new CoolException(entity.getMatnr() + "在作业清单中，无法执行删除操作！！"); } if (!matService.delete(new EntityWrapper<>(entity))) { if (!matService.delete(new EntityWrapper<Mat>() .eq("matnr", entity.getMatnr()) .eq("supp_code", entity.getSuppCode()))) { throw new CoolException("删除失败，请联系管理员"); } } src/main/java/com/zy/asrs/entity/TaskDetlLog.java
@@ -2,25 +2,37 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.enums.IdType; import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.baomidou.mybatisplus.annotations.TableField; import java.text.SimpleDateFormat; import java.util.Date; import com.zy.asrs.service.BasAreasService; import com.zy.asrs.service.LocCacheService; import com.zy.asrs.service.TaskLogService; import org.springframework.format.annotation.DateTimeFormat; import com.core.common.SpringUtils; import com.zy.system.service.UserService; import com.zy.system.entity.User; import java.text.SimpleDateFormat; import java.util.Date; import com.core.common.SpringUtils; import com.zy.system.service.UserService; import com.zy.system.entity.User; import java.text.SimpleDateFormat; import java.util.Date; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.baomidou.mybatisplus.annotations.TableName; import java.io.Serializable; import java.util.Objects; @Data @TableName("agv_task_detl_log") @@ -312,7 +324,8 @@ @TableField("box_type3") private String boxType3; public TaskDetlLog() {} public TaskDetlLog() { } public TaskDetlLog(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long lineNumber,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) { this.wrkNo = wrkNo; @@ -420,7 +433,9 @@ } public String getBeBatch$(){ if (null == this.beBatch){ return null; } if (null == this.beBatch) { return null; } switch (this.beBatch){ case 1: return "是"; @@ -432,7 +447,9 @@ } public String getSource$(){ if (null == this.source){ return null; } if (null == this.source) { return null; } switch (this.source){ case 1: return "制造"; @@ -446,7 +463,9 @@ } public String getInspect$(){ if (null == this.inspect){ return null; } if (null == this.inspect) { return null; } switch (this.inspect){ case 1: return "是"; @@ -458,7 +477,9 @@ } public String getDanger$(){ if (null == this.danger){ return null; } if (null == this.danger) { return null; } switch (this.danger){ case 1: return "是"; @@ -469,6 +490,45 @@ } } /** * 获取库区类型 * * @return java.lang.String * @author Ryan * @date 2026/1/19 14:07 */ public String getAreaType() { if (null == this.wrkNo) { return null; } TaskLogService taskLogService = SpringUtils.getBean(TaskLogService.class); TaskLog taskLog = taskLogService.selectOne(new EntityWrapper<TaskLog>().eq("wrk_no", this.wrkNo)); if (Objects.isNull(taskLog)) { return null; } LocCacheService locCacheService = SpringUtils.getBean(LocCacheService.class); LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", taskLog.getLocNo())); if (Objects.isNull(locCache)) { return null; } BasAreasService basAreasService = SpringUtils.getBean(BasAreasService.class); BasAreas basAreas = basAreasService.selectById(locCache.getAreaId()); if (Objects.isNull(basAreas)) { return null; } if (basAreas.getAreaNo().equals("SO")) { return "2"; } else if (basAreas.getAreaNo().equals("EO")) { return "3"; } else if (basAreas.getAreaNo().equals("LK")) { return "1"; } else { return "4"; } } public String getModiUser$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.modiUser); src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -19,6 +19,8 @@ import com.zy.asrs.entity.*; import com.zy.asrs.enums.OrderTypeEnum; import com.zy.asrs.service.*; import com.zy.asrs.service.impl.TaskDetlLogServiceImpl; import com.zy.asrs.service.impl.TaskDetlServiceImpl; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.utils.OrderInAndOutUtil; @@ -69,6 +71,8 @@ private LocDetlService locDetlService; @Autowired CheckOrderDetlService checkOrderDetlService; @Autowired private TaskDetlLogService taskDetlLogService; @Transactional @@ -361,6 +365,15 @@ if (Objects.isNull(material)) { throw new CoolException("物料不存在"); } TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>() .eq("matnr", detl.getMatnr()) .eq("supp_code", detl.getStandby1()) .eq("order_no", detl.getOrderNo())); if (Objects.isNull(detlLog)) { throw new CoolException("数据错误 ，请检查AGV任务档是否已完成！！"); } //目标库区 orderParam.setTarget_location(detlLog.getAreaType()); OrderItemsParam itemParam = new OrderItemsParam(); // BS Code itemParam @@ -371,12 +384,19 @@ // 上报时，默认产品id是供应商编码 .setPro_id(detl.getSuppCode()) // // 上报时，默认来源位置是null .setLocation_no(null) .setLocation_no(detlLog.getZpallet()) // 上报时，默认上报数量是订单数量 .setPick_qty(detl.getQty().intValue()); reportOrderParams.add(itemParam); }); if (orderParam.getTarget_location().equals("2")) { orderParam.setType("11"); } else if (orderParam.getTarget_location().equals("3")) { orderParam.setType("12"); } else { orderParam.setType("13"); } orderParam.setPartList(reportOrderParams); XSR response = null; src/main/webapp/views/locCache/locCache.html
@@ -33,7 +33,8 @@ <select name="area_name"> <option value="">库区名称</option> <option value="入库区">入库区</option> <option value="集货区">集货区</option> <option value="SO">SO库区</option> <option value="EO">EO库区</option> </select> </div> </div> src/main/webapp/views/mat/mat.html
@@ -98,9 +98,9 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品规格:</label> <label class="layui-form-label" style="padding: 8px 15px 8px 15px">供应商:</label> <div class="layui-input-inline"> <input name="specs" class="layui-input" placeholder="输入商品规格"/> <input name="suppCode" class="layui-input" placeholder="输入商品规格"/> </div> </div> <div class="layui-inline">  @@ -130,19 +130,19 @@ <button class="layui-btn layui-btn-sm" id="btn-batch-update" lay-event="batchModifties">批量修改</button> <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button> <!-- 商品/物料 数据中心 --> <div class="dropdown-menu" style="float: right"> <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 数据同步 <i class="layui-icon layui-icon-drop"></i></button> <ul class="dropdown-menu-nav dark"> <div class="dropdown-anchor"></div> <li class="title">1st menu</li> <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>模板下载</a></li> <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>导入 Excel</a></li> <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li> <hr> <li class="title">2nd menu</li> <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>导出 Excel</a></li> </ul> </div> <!-- <div class="dropdown-menu" style="float: right">--> <!-- <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 数据同步 <i class="layui-icon layui-icon-drop"></i></button>--> <!-- <ul class="dropdown-menu-nav dark">--> <!-- <div class="dropdown-anchor"></div>--> <!-- <li class="title">1st menu</li>--> <!-- <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>模板下载</a></li>--> <!-- <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>导入 Excel</a></li>--> <!-- <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>--> <!-- <hr>--> <!-- <li class="title">2nd menu</li>--> <!-- <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>导出 Excel</a></li>--> <!-- </ul>--> <!-- </div>--> <!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">导出</button>--> </div> </script>
