1.物料日志增加弹夹号

src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java

@@ -165,6 +165,8 @@ public class TaskDto implements Serializable {
 
     private String y = "";
 
+    private String binClipNo = "";
+
     public String getTaskColor() {
         if (ObjectUtil.isNotEmpty(lightColor)) {
             return "#" + lightColor;

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -365,6 +365,7 @@ public class DataLog extends BasePo implements Serializable {
     //迈征的 弹夹 x,y坐标
     private String x;
     private String y;
+    private String binClipNo;
 
     //完整条码
     private String fullCode;

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/InnerBoxRestController.java

@@ -109,6 +109,7 @@ public class InnerBoxRestController {
         String boxSide = request.getParameter("boxSide"); //料箱隔口
         String x = request.getParameter("x");
         String y = request.getParameter("y");
+        String binClipNo = request.getParameter("binClipNo");
         log.info("IA 出库更新任务状态--barcode:{},status:{},loc:{},hSerial:{},outlet:{},boxSide:{},cid:{},outlet:{},x:{},y:{}", code, status, loc, hSerial, outlet, boxSide, cid, outlet, x, y);
 
         CodeBean codeBean = codeResolve.resolveSingleCode(code);
@@ -149,6 +150,9 @@ public class InnerBoxRestController {
         if (StringUtils.isNotEmpty(y)) {
             opTask.setY(y);
         }
+        if (StringUtils.isNotEmpty(binClipNo)) {
+            opTask.setBinClipNo(binClipNo);
+        }
         opTask.setFullCode(barcode.getFullCode());
 
         taskService.moveTaskToFinished(opTask);