Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms_shandonghaiwang into develop

肖超群
2 parents 0ec8d3c2 3ae8caad
Showing 1 changed file with 1 additions and 1 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
@@ -139,7 +139,7 @@ public class MesReceiptController extends BaseController {
             receiptDetail.setIsVirtualBom(detail.getIsVirtual());
             receiptDetail.setMaterialCode(detail.getMaterialCode());
             receiptDetail.setMaterialName(detail.getMaterialName());
-            receiptDetail.setMaterialSpec(material.getSpec());
+            receiptDetail.setMaterialSpec(material == null ? null : material.getSpec());
             receiptDetail.setQty(detail.getQty());
             receiptDetail.setIsUrgent(detail.getIsUrgent());
             receiptDetail.setNoticeNo(detail.getNoticeNo());