【生成挤塑订单】

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/tpluslasteststock/TplusLastestStockMapper.java

@@ -41,7 +41,7 @@ public interface TplusLastestStockMapper extends BaseMapperX<TplusLastestStockDO
     default List<TplusLastestStockDO> selectJiShu() {
         MPJLambdaWrapper<TplusLastestStockDO> query = new MPJLambdaWrapper<>();
 
-        query.distinct().select("a.code as inventory_code,sum(t.availableQuantity) availableQuantity")
+        query.distinct().select("a.code as inventory_code,ifnull(sum(t.available_quantity),0)availableQuantity")
                 .rightJoin(MaterialDO.class,"a",MaterialDO::getCode,TplusLastestStockDO::getInventoryCode)
                 .groupBy(MaterialDO::getCode)
                 .orderByDesc(TplusLastestStockDO::getInventoryCode);

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetSchedule.java

@@ -529,6 +529,7 @@ public class ChanjetSchedule {
                 MaterialDO materialDO =  materialMapper.selectOne(MaterialDO::getCode,so.getInventoryCode());
 
                 if(materialDO!= null){
+                    if(materialDO.getInvSafe()==null) materialDO.setInvSafe(BigDecimal.valueOf(0));
                     BigDecimal absValue = new BigDecimal(so.getAvailableQuantity()).subtract(materialDO.getInvSafe());
                     if(absValue.compareTo(new BigDecimal(0))<0) {
                         ProjectOrderSubDO newDo = new ProjectOrderSubDO();