仓库管理修改

blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StGraphiteMoldOut.java

@@ -158,6 +158,17 @@ public class StGraphiteMoldOut extends TenantEntity {
 	 * 齐套数量
 	 */
 	@Schema(description = "齐套数量")
-	private Double completeQuantity;
+	private Integer completeQuantity;
 
+	/**
+	 * 生产数量
+	 */
+	@Schema(description = "生产数量")
+	private Double produceQuantity;
+
+	/**
+	 * 单套数量
+	 */
+	@Schema(description = "单套数量")
+	private Double singleQuantity;
 }

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGraphiteMoldOutMapper.xml

@@ -36,6 +36,7 @@
         gmo.card_no, gmo.need_quantity, gmo.outed_quantity,
         gmo.cur_status, gmo.out_time, gmo.out_user, gmo.out_code, gmo.picker,
         gmo.parent_out_code, gmo.complete_quantity,
+        gmo.produce_quantity, gmo.single_quantity,
         -- 物料表字段
         g.goods_code,
         g.id AS goodsId,

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java

@@ -170,8 +170,10 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 				preOutStock.setOutCode(outCode);
 				childNum++;
 //			preOutStock.setOutCode(stStockInoutRecordService.generateCode());
-				preOutStock.setNeedQuantity(singleUse * totalNeedSet);
+				preOutStock.setProduceQuantity(totalNeedSet);
-				preOutStock.setCompleteQuantity(totalNeed);
+				preOutStock.setNeedQuantity(singleUse * maxCanMakeSet);
+				preOutStock.setCompleteQuantity(maxCanMakeSet);
+				preOutStock.setSingleQuantity(singleUse);
 				preOutStock.setGoodsId(maxStock.getGoodsId());
 				StGoods stGoods = stGoodsService.getById(maxStock.getGoodsId());
 				preOutStock.setGoodsName(stGoods.getGoodsName());
@@ -391,8 +393,8 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 			this.updateById(outEntity);
 			resultList.add(outEntity);
 
-			if (outEntity.getOutedQuantity() < outEntity.getCompleteQuantity()) {
+			if (outEntity.getOutedQuantity() < outEntity.getNeedQuantity()) {
-				Double resOccupyQty = outEntity.getCompleteQuantity() - outEntity.getOutedQuantity();
+				Double resOccupyQty = outEntity.getNeedQuantity() - outEntity.getOutedQuantity();
 				realtimeStock.setOccupyQuantity(realtimeStock.getOccupyQuantity() - resOccupyQty);
 				stRealtimeStockService.updateById(realtimeStock);