增加点料数量接口

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -95,6 +95,16 @@ public class Barcode extends BasePo implements Serializable {
      */
      */
     private String batch="";
     private String batch="";
 
 
+    /**
+     * 原始数量
+     */
+    private int oriAmount;
+
+    /**
+     * 点料次数
+     */
+    private int xrayCount = 0;
+
     public String getMbatch() {
     public String getMbatch() {
         try {
         try {
 
 

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

 
 
 package com.neotel.smfcore.core.device.rest;
 package com.neotel.smfcore.core.device.rest;
 
 
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
@@ -14,7 +15,9 @@ import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.api.SmfApi;
 import com.neotel.smfcore.core.api.SmfApi;
 import com.neotel.smfcore.core.api.bean.CodeValidateParam;
 import com.neotel.smfcore.core.api.bean.CodeValidateParam;
+import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
+import com.neotel.smfcore.core.barcode.service.po.Component;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.device.bean.PosInfo;
 import com.neotel.smfcore.core.device.bean.PosInfo;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
@@ -64,6 +67,9 @@ public class DeviceController {
     @Autowired
     @Autowired
     private IStoragePosManager storagePosManager;
     private IStoragePosManager storagePosManager;
 
 
+    @Autowired
+    private IBarcodeManager barcodeManager;
+
     /**
     /**
      * 权限验证API列表
      * 权限验证API列表
      */
      */
@@ -687,4 +693,28 @@ public class DeviceController {
         }
         }
         return ResultBean.newErrorResult(1, "smfcore.cancelOutTask.fail","客户端取消入库任务[{0}]失败:{1}", new String[]{posName,""});
         return ResultBean.newErrorResult(1, "smfcore.cancelOutTask.fail","客户端取消入库任务[{0}]失败:{1}", new String[]{posName,""});
     }
     }
+
+    @ApiOperation("点料机传点料数量到服务器")
+    @RequestMapping(value = "/service/store/xrayUpdateAmount")
+    @ResponseBody
+    @AnonymousAccess
+    public ResultBean xrayUpdateAmount(HttpServletRequest request) {
+        String amountStr = request.getParameter("amount");
+        String barcodeStr = request.getParameter("barcode");
+        log.info("点料信息:barcode:"+barcodeStr+",amount为:"+amountStr);
+
+        if (StringUtils.isNotBlank(barcodeStr)) {
+            Barcode barcode = barcodeManager.findByBarcode(barcodeStr);
+            if (barcode != null) {
+                int amount = barcode.getAmount();
+                barcode.setAmount(NumberUtil.parseInt(amountStr));
+                barcode.setOriAmount(amount);
+                barcode.setXrayCount(barcode.getXrayCount() + 1);
+                barcodeManager.save(barcode);
+                return ResultBean.newOkResult(barcode.getOriAmount());
+            }
+        }
+        return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"barcode", barcodeStr});
+    }
+
 }
 }