锁定库存出库

sd-business/src/main/java/com/sd/business/service/inventory/InventoryFinishedService.java

@@ -45,6 +45,9 @@ public interface InventoryFinishedService extends BaseService<InventoryFinished>
      */
     void saleOutOfWarehouse(List<Long> orderIdList);
 
+    /**
+     * 成品仓出入库excel导出
+     */
     void excelExport(InventoryFinishedSelectDto dto);
 
 }

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryFinishedOrderServiceImpl.java

@@ -95,6 +95,8 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
             }
         }
 
+        updateBatchById(list);
+
         // 添加流水记录
         inventoryFinishedOrderDetailService.add(list, FinishedOperationTypeEnum.SALE_OUT_OF_WAREHOUSE);
     }

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryFinishedServiceImpl.java

@@ -53,6 +53,7 @@ public class InventoryFinishedServiceImpl extends ServiceImpl<InventoryFinishedM
         wrapper.orderByDesc("i", InventoryFinished::getId);
         wrapper.like("ss", SkuSpec::getCode, dto.getSkuSpecCode());
         wrapper.like("ss", SkuSpec::getName, dto.getSkuSpecName());
+        wrapper.gt("i", InventoryFinished::getQuantity, 0);
         return this.baseMapper.getPage(dto.getPage(), wrapper);
     }
 

sd-business/src/main/resources/mapper/inventory/InventoryFinishedOrderMapper.xml

@@ -14,8 +14,9 @@
                ifod.code
         from inventory_finished_order_detail ifod
                  inner join order_info oi on ifod.order_info_id = oi.id
-                 inner join department d on ifod.department_id = d.id
+                 inner join department d on oi.department_id = d.id
                  inner join sku_spec ss on ifod.sku_spec_id = ss.id
+            ${ew.customSqlSegment}
     </select>
 
 </mapper>

sd-wln/src/main/java/com/sd/wln/service/impl/WlnStatementOfAccountImpl.java

@@ -141,7 +141,7 @@ public class WlnStatementOfAccountImpl implements WlnStatementOfAccount {
         inventoryFinishedService.productionWarehousing(productionWarehousingOrderIdList);
 
         // 库存销售出库
-        List<Long> orderIdList = orderList.stream().map(BaseIdPo::getId).collect(Collectors.toList());
+        List<Long> orderIdList = editOrderInfoList.stream().map(BaseIdPo::getId).collect(Collectors.toList());
         inventoryFinishedService.saleOutOfWarehouse(orderIdList);
 
     }