设备自报提交

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -765,6 +765,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBill.setStatus(Constants.NEW);
         abnormalBill.setSfc(sfc);
         abnormalBill.setShopOrder(shopOrder);
+        if(shopOrder != null ){
+            ShopOrder shopOrder1 = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, shopOrder));
+            abnormalBill.setItemBo(shopOrder1.getItemBo());
+        }
         abnormalBill.setResrce(resource);
         abnormalBill.setEntityLocation(position);
         abnormalBill.setNcQty(ncQty);
@@ -964,8 +968,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         ShopOrderDto projectNo = shopOrderMapper.findByShopOrderBo(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBill.getShopOrder()));
         //物料
         Item _item = itemMapper.selectById(locale, abnormalBill.getItemBo());
-        String item = _item.getItem() + "/" + _item.getDescription();
+        String item = "";
-
+        if(_item != null){
+            item = _item.getItem() + "/" + _item.getDescription();
+        }
         if(workCenter != null){
             messageMap.put("WORKCENTER",workCenter.getDescription());
         }