厂外库入库优化。

src/main/java/com/steerinfo/dil/service/impl/OyeResultServiceImpl.java

@@ -298,10 +298,11 @@ public class OyeResultServiceImpl implements IOyeResultService {
         BigDecimal materialNumber = DataChange.dataToBigDecimal(map.get("materialNumber"));
         BigDecimal netWeight = DataChange.dataToBigDecimal(map.get("netWeight"));
         BigDecimal singleWeight = DataChange.dataToBigDecimal(map.get("singleWeight"));
+        String materialName = map.get("materialName") == null ? "" : map.get("materialName").toString();
         OyeRealtimeInventory oyeRealtimeInventory = oyeRealtimeInventoryMapper.selectByPrimaryKey(inventoryId);
         if (flag.compareTo(new BigDecimal(1)) == 0) {
-            System.out.println("singleWeight:" + singleWeight.doubleValue() + ";oyeRealtimeInventory.getSingleWeight():" + oyeRealtimeInventory.getSingleWeight().doubleValue());
-            if(!DataChange.isEqual(singleWeight, oyeRealtimeInventory.getSingleWeight())){
+            System.out.println("materialName:" + materialName + ";singleWeight:" + singleWeight.doubleValue() + ";oyeRealtimeInventory.getSingleWeight():" + oyeRealtimeInventory.getSingleWeight().doubleValue());
+            if(materialName.contains("定尺") && !DataChange.isEqual(singleWeight, oyeRealtimeInventory.getSingleWeight())){
                 throw new Exception("入库单件重量与实时库存单件重量不符，请仔细检查！");
             }
             oyeRealtimeInventory.setNetWeight(oyeRealtimeInventory.getNetWeight().add(netWeight));