Merge remote-tracking branch 'origin/hella_online_20241011' into hella_online_20241011

sql/release_202405/wms_202405.sql

@@ -3022,3 +3022,6 @@ INSERT INTO `document_switch` (`id`, `code`, `description`, `effective_set_value
 
 alter table `request_purchasereceipt_detail` add `second_pack_qty` decimal(18,6) DEFAULT NULL COMMENT '第二个包装数量';
 alter table `request_purchasereceipt_detail` add `second_pack_unit` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '第二个包装规格';
+
+-- 修改账户类型为非必填
+ALTER TABLE `export_supplier_apbalance_main` MODIFY COLUMN `tt_gltype` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '账户类型(AP应付/OTHAP其他应付/PREPAY预付)'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionscrapRecord/ProductionscrapRecordMainServiceImpl.java

@@ -239,6 +239,9 @@ public class ProductionscrapRecordMainServiceImpl implements ProductionscrapReco
                 transactionCreateReqVO.setPackUnit(jobUtils.getItemareaDO(transactionCreateReqVO.getItemCode(), areabasicDO.getCode()).getInPackUnit());
                 transactionCreateReqVO.setPackQty(jobUtils.getItempackageDO(transactionCreateReqVO.getItemCode(), transactionCreateReqVO.getPackUnit()).getPackQty());
             }
+            LocationDO locationDO = locationService.selectLocation(transactionCreateReqVO.getLocationCode());
+            transactionCreateReqVO.setWarehouseCode(locationDO.getWarehouseCode());
+            transactionCreateReqVO.setLocationGroupCode(locationDO.getLocationGroupCode());
             transactionCreateReqVOList.add(transactionCreateReqVO);
         }
         // 增加库存事务