1.看板区生成工单不出库 问题修改

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrderItem.java

@@ -98,6 +98,11 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li
      */
     private String barcodeStr = "";
 
+
+    private String batch = "";
+
+    private int amount;
+
     /**
      * 自定义的附加字段，key=字段名，value=值
      */

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialController.java

@@ -422,10 +422,14 @@ public class MaterialController {
                 kanBanAreaOutMap.put("partNumber", barcode.getPartNumber());
                 kanBanAreaOutMap.put("amount", barcode.getAmount());
                 kanBanAreaOutMap.put("batch", barcode.getBatch());
+
                 try {
                     log.info("通知看板区,参数为:"+ JSON.toJSONString(kanBanAreaOutMap));
                     String result = HttpHelper.postJson(kanBanAreaOutUrl, kanBanAreaOutMap);
                     log.info("通知结果为:" + result);
+                    if (StringUtils.isNotEmpty(result) && !result.equals("\"\"")){
+                        return ResultBean.newErrorResult(-1, "smfcore.notifyerror.kanban", "保管区无物料,通知看板区失败[{0}]", new String[]{result});
+                    }
                 } catch (ApiException e) {
                     log.info("通知失败:", e);
                     ProductionAreaOut areaOut = new ProductionAreaOut(barcode.getPartNumber(), barcode.getAmount(), barcode.getBatch(), e.getMessage(), new Date());

src/main/java/com/neotel/smfcore/custom/toyota1541/controller/KanbanAreOutController.java

@@ -38,11 +38,11 @@ public class KanbanAreOutController {
     @ApiOperation("新增看板区出库信息")
     @RequestMapping("/addKanbanAreOut")
     @AnonymousAccess
-    public ResultBean addKanbanAreOut(@RequestBody KanbanAreaOut areaOut) {
+    public String addKanbanAreOut(@RequestBody KanbanAreaOut areaOut) {
         log.info("收到生成区新出库信息,partNumber为[{}],id为[{}]",areaOut.getPartNumber(),areaOut.getId());
         areaOut.setReceiveDate(new Date());
         KanbanAreOutUtil.updateKanbanAreOut(areaOut);
-        return ResultBean.newOkResult("");
+        return "";
     }
 
     @ApiOperation("获取所有看板区要出库的任务")
@@ -75,8 +75,10 @@ public class KanbanAreOutController {
             LiteOrderItem item = new LiteOrderItem();
             item.setPn(areaOut.getPartNumber());
             item.setNeedReelCount(1);
-            item.addAppendDate("batch", areaOut.getBatch());
-            item.addAppendDate("amount", areaOut.getAmount() + "");
+            item.setBatch(areaOut.getBatch());
+            item.setAmount(areaOut.getAmount());
+            //item.addAppendDate("batch", areaOut.getBatch());
+            //item.addAppendDate("amount", areaOut.getAmount() + "");
             log.info("看板区生成工单并出库,partNumber为[{}],id为[{}],工单号为[{}]",areaOut.getPartNumber(),areaOut.getId(),order.getOrderNo());
             itemList.add(item);
         }