diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index df3375ca..aa47ee68 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -35,6 +35,7 @@ import com.glxp.api.service.inv.InvProductService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrDataService; import com.glxp.api.service.thrsys.ThrSystemService; +import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; @@ -683,7 +684,7 @@ public class UdiRelevanceController extends BaseController { boolean falg = udiProductService.updateUdiInfoById(udiProductEntity); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setId(udiProductEntity.getUid()); - udiRelevanceEntity.setGroupBuy(udiProductEntity.isGroupBuy()); + udiRelevanceEntity.setGroupBuy(IntUtil.value(udiProductEntity.getGroupBuy())); boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); if (udiProductEntity.getRelSupId() != null) { UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity(); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 168162a8..e712685a 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -95,7 +95,7 @@ public class UdiProductEntity { private Long relSupId; - private boolean groupBuy; + private Boolean groupBuy; private Long uid; diff --git a/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java b/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java index df71d503..d3063dd6 100644 --- a/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java @@ -23,6 +23,7 @@ public class InnerOrderPrintResponse { private String ylqxzcrbarmc; private String zczbhhzbapzbh; private String warehouseName; + private String manufactory; private String warehouseCode; private String spaceCode; private String spaceName; diff --git a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml index 38a6c2f3..a1aacfb0 100644 --- a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml @@ -1,10 +1,10 @@ - + - + @@ -54,6 +54,7 @@ basic_products.cpmctymc, basic_products.ylqxzcrbarmc, basic_products.zczbhhzbapzbh, + basic_products.manufactory, basic_products.ggxh FROM inv_inner_order_print diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index 955824b3..f1ac0ad1 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/src/main/resources/schemas/schema_v2.3.sql @@ -623,39 +623,6 @@ INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, VALUES (20078, 0, '是否启用价格先进先出策略', 'price_fifo', '1', 1, 0, '0：否；1：是', '2023-10-10 10:10:08'); - -INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, - `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, - `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2006, '首页111111', 0, 20, 'home/11111', NULL, NULL, 1, 0, 'M', '1', '0', NULL, NULL, '超级用户', - '2023-11-17 09:27:27', NULL, NULL, NULL); -INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, - `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, - `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2007, '已对照产品', 2006, 1, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:product', NULL, '超级用户', - '2023-11-17 09:30:47', NULL, NULL, NULL); -INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, - `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, - `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2008, '库存预警', 2006, 2, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:invWarn', NULL, '超级用户', - '2023-11-17 09:35:08', NULL, NULL, NULL); -INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, - `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, - `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2009, '资质预警', 2006, 3, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:certWarn', NULL, '超级用户', - '2023-11-17 09:35:24', NULL, NULL, NULL); -INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, - `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, - `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2010, '待办事项', 2006, 4, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:todo', NULL, '超级用户', - '2023-11-17 09:36:08', NULL, NULL, NULL); -INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, - `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, - `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2011, '待审核单据·', 2006, 5, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:ioAudit', NULL, '超级用户', - '2023-11-17 09:36:26', NULL, NULL, NULL); - - CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inPreInBack', 'tinyint', 1);