更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -333,6 +333,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             warehouseInOutInfo.setStatusFlag("3");
             warehouseInOutInfo.setStatus("已提交");
             warehouseInOutInfo.setPaymentId(paymentManagement.getId());
+            CommonSysParameter commonSysParameter = iCommonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", paymentManagement1.getGoodsName()));
+            warehouseInOutInfo.setGoodsNameKey(commonSysParameter.getConstKey());
+            warehouseInOutInfo.setInOutFlag("2");
             warehouseInOutInfoService.updateById(warehouseInOutInfo);
             float original = 0f;
             // 查询货物库存量

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -56,6 +56,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     @Autowired
     private ICommonStaffService staffService;
     @Autowired
+    private ICommonSysParameterService iCommonSysParameterService;
+    @Autowired
     private QRCodeUtil qrCodeUtil ;
     /**
      * 质检管理列表
@@ -292,6 +294,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         qualityInspectionManagement.setStatusFlag(StatusEnum.FIRST_INSPECTED.getFlag());
         qualityInspectionManagement.setAgentKey(AuthSecurityUtils.getCurrentUserId());
         qualityInspectionManagement.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
+        CommonSysParameter commonSysParameter = iCommonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", qualityInspectionManagement.getGoodsName()));
+        qualityInspectionManagement.setGoodsNameKey(commonSysParameter.getConstKey());
         //生成检斤信息
         WeighingManagement weighingManagement=new WeighingManagement();
         weighingManagement.setId(IdGenerator.generateUUID());
@@ -306,6 +310,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         weighingManagement.setCarNumber(qualityInspectionManagement.getCarNumber());
         weighingManagement.setCompId(qualityInspectionManagement.getCompId());
         weighingManagement.setServiceManagementType(qualityInspectionManagement.getServiceManagementType());
+        weighingManagement.setGoodsNameKey(qualityInspectionManagement.getGoodsNameKey());
         weighingManagement.setGoodsName(qualityInspectionManagement.getGoodsName());
         weighingManagement.setBinNumber(qualityInspectionManagement.getBinNumber());
         weighingManagement.setType(qualityInspectionManagement.getType());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -218,14 +218,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                             // 查询入库数量
                             List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                                     .eq("position_id", warehousePositionInfo.getId()).eq("delete_flag", "0")
-                                    .eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
+                                    .eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name").orderBy("goods_name"));
                             if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
                                     WarehouseNumView warehouseNumView = new WarehouseNumView();
                                     // 查询入库数量
                                     List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                                             .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "2").eq("delete_flag", "0")
-                                            .eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                            .eq("status_flag", "3").eq("goods_name", warehouseInOutInfo.getGoodsName()));
                                     if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                                         Double netWeight = 0d;
                                         for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
@@ -268,14 +268,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                             // 查询出库数量
                             List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                                     .eq("position_id", warehousePositionInfo.getId()).eq("delete_flag", "0")
-                                    .eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
+                                    .eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name").orderBy("goods_name"));
                             if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
                                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
                                     Double netWeight = 0d;
                                     outNetWeight = "0";
                                     List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                                             .eq("status_flag", "3").eq("delete_flag", "0")
-                                            .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                            .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").eq("goods_name", warehouseInOutInfo.getGoodsName()));
                                     if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                                         for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
                                             //潮粮累计纯重，干粮累计净重
@@ -337,14 +337,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     // 查询入库数量
                     List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                             .eq("base_id", warehouseBaseInfo.getId()).eq("delete_flag", "0")
-                            .eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
+                            .eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name").orderBy("goods_name"));
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
                             WarehouseNumView warehouseNumView = new WarehouseNumView();
                             // 查询入库数量
                             List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                                     .eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "2").eq("delete_flag", "0")
-                                    .eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                    .eq("status_flag", "3").eq("goods_name", warehouseInOutInfo.getGoodsName()));
 
                             if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                                 Double netWeight = 0d;
@@ -370,14 +370,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     // 查询出库数量
                     List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                             .eq("base_id", warehouseBaseInfo.getId()).eq("delete_flag", "0")
-                            .eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
+                            .eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name").orderBy("goods_name"));
                     if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
                             Double netWeight = 0d;
                             outNetWeight = "0";
                             List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                                     .eq("status_flag", "3").eq("delete_flag", "0")
-                                    .eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                    .eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "1").eq("goods_name", warehouseInOutInfo.getGoodsName()));
                             if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                                 for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
                                     //潮粮累计纯重，干粮累计净重