销售订单库存为空修改

docs/new_sql.sql

@@ -158,6 +158,7 @@ ALTER TABLE jsh_material_extend
   MODIFY wholesale_decimal DECIMAL(24,2) DEFAULT NULL COMMENT '销售价格',
   MODIFY low_decimal DECIMAL(24,2) DEFAULT NULL COMMENT '最低售价',
   MODIFY inventory DECIMAL(10,0) DEFAULT 0 COMMENT 'inventory';
+  MODIFY inventory DECIMAL(10,0) DEFAULT 0 COMMENT '库存';
 
 -- 初始库存表 修改库存类型
 ALTER TABLE jsh_material_initial_stock

src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -1192,7 +1192,8 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
         Boolean forceFlag = systemConfigService.getForceApprovalFlag();
         Boolean inOutManageFlag = systemConfigService.getInOutManageFlag();
         //初始库存
-        BigDecimal initStock = materialService.getInitStockByMidAndDepotList(depotList, mId);
+        BigDecimal stock = materialService.getInitStockByMidAndDepotList(depotList, mId);
+        BigDecimal initStock = stock == null ? BigDecimal.ZERO : stock;
         //盘点复盘后数量的变动
         BigDecimal stockCheckSum = depotItemMapperEx.getStockCheckSumByDepotList(depotList, mId, forceFlag, beginTime, endTime);
         //表单的数量

src/main/java/com/jsh/erp/service/impl/MaterialExtendServiceImpl.java

@@ -482,7 +482,7 @@ public class MaterialExtendServiceImpl extends ServiceImpl<MaterialExtendMapper,
     @Override
     public MaterialExtend getInfoByBarCode(String barCode)throws Exception {
         MaterialExtendExample example = new MaterialExtendExample();
-        example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        example.createCriteria().andBarCodeLike(barCode).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
         List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
         if(list!=null && list.size()>0) {
             return list.get(0);

src/main/java/com/jsh/erp/service/impl/MaterialServiceImpl.java

@@ -1297,9 +1297,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         List<MaterialInitialStock> list = materialInitialStockMapper.selectByExample(example);
         if(list!=null && list.size()>0) {
             for(MaterialInitialStock ms: list) {
-                if(ms!=null) {
-                    stock = stock.add(ms.getNumber());
-                }
+                    stock = stock.add(ms.getNumber() == null ? BigDecimal.ZERO : ms.getNumber());
             }
         }
         return stock;

src/main/resources/mapper_xml/MaterialMapperEx.xml

@@ -795,7 +795,7 @@
         select m.*,u.name unit_name, me.id meId, me.commodity_unit, me.purchase_decimal, me.commodity_decimal,me.inventory,
         me.wholesale_decimal, me.low_decimal, me.sku,me.production_date, me.expiry_num, me.supplier_id, me.bar_code, me.batch_number, me.depot_id, me.position,d.`name` depotName,s.supplier supplierName
         from jsh_material m
-        left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
+        left join material_batch me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
         left join jsh_unit u on m.unit_id=u.id and ifnull(u.delete_Flag,'0') !='1'
         left JOIN jsh_depot d on me.depot_id = d.id and ifnull(d.delete_Flag,'0') !='1'
         left JOIN jsh_supplier s on me.supplier_id = s.id and ifnull(s.delete_Flag,'0') !='1'