成品入库回传ERP单据后显示错误信息

易文鹏
1 parent 2dd44e8f
Showing 4 changed files with 21 additions and 2 deletions
src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
src/main/java/com/huaheng/pc/barcode/barcodeHeader/domain/BarCodeHeader.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
@@ -276,6 +276,7 @@ public class TaskReturnServiceImpl implements TaskReturnService {
         Integer pushErrorCount = barCodeHeader.getPushErrorCount() == null ? 0 : barCodeHeader.getPushErrorCount();
         barCodeHeader.setPushErrorCount(pushErrorCount + 1);
         barCodeHeader.setLocked(4);//回传失败
+        barCodeHeader.setErpErrorMsg(erpAjaxResult.getMsg() + erpAjaxResult.getErrorMsg());
         barCodeHeaderService.updateById(barCodeHeader);
         return AjaxResult.error(erpAjaxResult.getMsg() + erpAjaxResult.getErrorMsg());
     }
@@ -296,4 +296,10 @@ public class BarCodeHeader implements Serializable {
     @ApiModelProperty(value = "物料单位")
     private String materialUnit;
  
-}
 \ No newline at end of file
+    /**
+     * erp错误消息
+     */
+    @TableField(value = "erpErrorMsg")
+    @ApiModelProperty(value="erp错误消息")
+    public String erpErrorMsg;
+}
@@ -109,7 +109,7 @@ public class ShippingCombinationService {
         materialTypelam.eq(MaterialType::getCode,material.getType()).eq(MaterialType::getWarehouseCode,shipmentDetail.getWarehouseCode());
         MaterialType materialType=materialTypeService.getOne(materialTypelam);
         if(materialType==null){
-            throw new ServiceException(material.getType()+"物料种类不存在");
+            throw new ServiceException(material.getType()+"物料类别不存在，可以到物料管理选择该物料的物料类别");
         }
         if(StringUtils.isNotEmpty(materialType.getAllocationRule())){
             filterConfigDetailLambdaQueryWrapper.eq(FilterConfigDetail::getCode,materialType.getAllocationRule());
@@ -316,6 +316,18 @@
                     title : '-1回传重量',
                 },
                 {
+                    field: 'erpErrorMsg',
+                    title: 'ERP回传错误信息',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        if(value == undefined || value == '')
+                            value = " "
+                        else
+                            actions.push('<pre style="max-height:50px; white-space: pre-wrap; width:500px">'+value+ '</pre>')
+                        return actions.join(" ")
+                    }
+                },
+                {
                     field : 'firstStatus',
                     title : '头状态',
                     align: 'center',