diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 4eeaafba..5f80a389 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -126,18 +126,21 @@ public class UdiRlSupController extends BaseController { //只查找主标识产品信息 companyProductRelevanceRequest.setDiType(1); } - //包装采购类型校验 + //校验是否需要扫码 if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getAction())) { BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(companyProductRelevanceRequest.getAction()); //是否校验产品采购类型 ：1：校验；2.无需校验 if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { companyProductRelevanceRequest.setPurType(IntUtil.value(bussinessTypeEntity.getActionType())); } + //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品 - if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { + if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 1) { companyProductRelevanceRequest.setCodeCheck(1); - }else if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 2) { - companyProductRelevanceRequest.setCodeCheck(2); + } else if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 2) { + companyProductRelevanceRequest.setCodeCheck(0); + } else { + companyProductRelevanceRequest.setCodeCheck(null); } } List basicInstrumentMaintainRelevanceResponses = null; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index d81aea1e..12d14557 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -10,6 +10,7 @@ import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; @@ -24,6 +25,7 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; +import com.glxp.api.util.CustomUtil; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -38,7 +40,7 @@ import java.util.Date; import java.util.List; @RestController -public class IoOrderInvoiceController { +public class IoOrderInvoiceController extends BaseController { @Resource IoOrderInvoiceService ioOrderInvoiceService; @Resource @@ -70,6 +72,10 @@ public class IoOrderInvoiceController { @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/order/group/invoice") public BaseResponse filterGroup(IoOrderInvoiceRequest orderInvoiceRequest) { + String supId = getCustomerId(); + if (!supId.equals("110")) { + orderInvoiceRequest.setSupId(supId); + } List orderInvoiceEntities = ioOrderInvoiceService.filterGroupBy(orderInvoiceRequest); PageInfo pageInfo = new PageInfo<>(orderInvoiceEntities); return ResultVOUtils.page(pageInfo); @@ -162,7 +168,7 @@ public class IoOrderInvoiceController { @Log(title = "发票管理", businessType = BusinessType.UPDATE) public BaseResponse uploadInvoice(@RequestBody IoOrderInvoiceEntity ioOrderInvoice) { - List ioOrderInvoiceEntityList=ioOrderInvoiceService.list(new QueryWrapper().eq("invoiceEncode",ioOrderInvoice.getInvoiceEncode())); + List ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper().eq("invoiceEncode", ioOrderInvoice.getInvoiceEncode())); for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) { ioOrderInvoiceEntity.setInvoiceDate(ioOrderInvoice.getInvoiceDate()); ioOrderInvoiceEntity.setPrice(ioOrderInvoice.getPrice()); @@ -185,7 +191,7 @@ public class IoOrderInvoiceController { if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode())) return ResultVOUtils.error(500, "发票编码不能为空"); - boolean b = ioOrderInvoiceService.remove(new QueryWrapper().eq("invoiceEncode", deleteRequest.getInvoiceEncode()).eq("orderIdFk",deleteRequest.getBillNo())); + boolean b = ioOrderInvoiceService.remove(new QueryWrapper().eq("invoiceEncode", deleteRequest.getInvoiceEncode()).eq("orderIdFk", deleteRequest.getBillNo())); if (b) return ResultVOUtils.success("删除成功！"); else @@ -199,10 +205,10 @@ public class IoOrderInvoiceController { return ResultVOUtils.error(500, "发票编码不能为空"); List ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper().eq("invoiceEncode", deleteRequest.getInvoiceEncode())); - if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList) && ioOrderInvoiceEntityList.size()>0){ - return ResultVOUtils.error(999,"发票编码已存在！"); + if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList) && ioOrderInvoiceEntityList.size() > 0) { + return ResultVOUtils.error(999, "发票编码已存在！"); } - return ResultVOUtils.success(); + return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index 4b7ba045..1ab1965e 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -95,6 +95,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { /** * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品 */ - @TableField(value = "codeCheck") private Integer codeCheck; } diff --git a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java index 84a2ae7b..fef4990d 100644 --- a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java @@ -83,6 +83,9 @@ public class IoOrderInvoiceRequest extends ListPageRequest { */ private String endTime; + //供应商ID + private String supId; + public static final String COL_ID = "id"; public static final String COL_ORDERIDFK = "orderIdFk"; diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index fa39a71d..ae995c8d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -46,7 +46,9 @@ basic_udirel.lockStatus, basic_udirel.mainId, basic_udirel.isAdavence, - basic_udirel.purType,basic_udirel.attributeType,basic_udirel.hcType, + basic_udirel.purType, + basic_udirel.attributeType, + basic_udirel.hcType, basic_udirel.lowStockNum, basic_udirel.overStockNum, basic_udirel.recentDateTime, @@ -118,10 +120,10 @@ basic_udirel.groupBuy, basic_udirel.id as uid, basic_corp.name companyName, - basic_products.catalogname1, - basic_products.catalogname2, - basic_products.catalogname3, - basic_products.matrial + basic_products.catalogname1, + basic_products.catalogname2, + basic_products.catalogname3, + basic_products.matrial FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id @@ -134,7 +136,7 @@ AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%') - AND basic_udirel.mainId LIKE concat('%',#{mainId}, '%') + AND basic_udirel.mainId LIKE concat('%', #{mainId}, '%') AND cpmctymc LIKE concat(#{cpmctymc}, '%') @@ -148,7 +150,7 @@ AND basic_udirel.purType = #{purType} - + AND basic_products.requireScanCode = #{codeCheck} diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml index b19c4f58..c798c427 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml @@ -37,38 +37,38 @@ - SELECT - io.nameCode, - ic.id, - ic.orderIdFk, - ic.bindRlFk, - ic.batchNo, - ic.productDate, - ic.expireDate, - ic.machineNo, - ic.invoiceCode, - ic.invoiceEncode, - ic.invoiceDate, - ic.updateTime, - ic.createUser, - ic.createTime, - ic.updateUser, - ic.remark, - ic.licenseUrl, - ic.bizIdFk, - io.coName, - io.price, - io.spec, - bp.measname, - io.manufacturer, - io.certCode, - io.reCount, - io.count + SELECT io.nameCode, + ic.id, + ic.orderIdFk, + ic.bindRlFk, + ic.batchNo, + ic.productDate, + ic.expireDate, + ic.machineNo, + ic.invoiceCode, + ic.invoiceEncode, + ic.invoiceDate, + ic.updateTime, + ic.createUser, + ic.createTime, + ic.updateUser, + ic.remark, + ic.licenseUrl, + ic.bizIdFk, + io.coName, + io.price, + io.spec, + bp.measname, + io.manufacturer, + io.certCode, + io.reCount, + io.count FROM io_order_invoice ic - INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk - LEFT JOIN basic_udirel bu - ON bu.id = ic.bindRlFk - LEFT JOIN basic_products bp ON bu.uuid = bp.uuid + INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk + LEFT JOIN basic_udirel bu + ON bu.id = ic.bindRlFk + LEFT JOIN basic_products bp ON bu.uuid = bp.uuid AND ic.orderIdFk = #{orderIdFk} @@ -164,9 +166,4 @@ group by io.billNo; - - - - - diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml index aa902d7c..cfeed9bf 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -80,7 +80,7 @@ SELECT sup_product.id, sup_product.productId, sup_product.enterpriseId, - sup_product.recordCode, + sup_product.recordProductName, sup_product.productManageType, sup_product.recordPeopleName, @@ -128,7 +128,8 @@ sup_manufacturer.companyName manufacturerName, sup_manufacturer.companyName, sup_manufacturer.agentName, - basic_products.ggxh + basic_products.ggxh, + basic_products.zczbhhzbapzbh recordCode FROM sup_product inner join sup_company on sup_product.customerId = sup_company.customerId diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index 965c839d..801469a8 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/src/main/resources/schemas/schema_v2.3.sql @@ -867,7 +867,7 @@ BEGIN END; -call Modify_UNIQUE_index('thr_products_add_di', '`uuid`, `customerId`', 'uniqueUuid', 'BTREE'); +# call Modify_UNIQUE_index('thr_products_add_di', '`uuid`, `customerId`', 'uniqueUuid', 'BTREE'); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailHcType', diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index ca81f6a6..ac94e27a 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -629,15 +629,38 @@ CALL Pro_Temp_ColumnWork('device_upkeep', 'taskBillNo', 1); -UPDATE auth_menu SET `menu_name` = '选入入院产品', `parent_id` = 1819, `order_num` = 3, `path` = 'supplier/products/supProductsOptinDi', - `component` = 'supplier/products/supProductsOptinDi', `query_param` = NULL, `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', - `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-17 10:04:07', - `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1759; - -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 - (2013, '新增入院产品', 1819, 3, 'supplier/products/supProductsAddDi', 'supplier/products/supProductsAddDi', - NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-17 10:04:07', NULL, NULL, NULL); +CALL Pro_Temp_ColumnWork('basic_products', 'bzgg', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''包装规格''', + 1); + + +UPDATE auth_menu +SET `menu_name` = '选入入院产品', + `parent_id` = 1819, + `order_num` = 3, + `path` = 'supplier/products/supProductsOptinDi', + `component` = 'supplier/products/supProductsOptinDi', + `query_param` = NULL, + `is_frame` = 1, + `is_cache` = 0, + `menu_type` = 'C', + `visible` = '0', + `status` = '0', + `perms` = NULL, + `icon` = NULL, + `create_by` = '超级用户', + `create_time` = '2023-02-17 10:04:07', + `update_by` = NULL, + `update_time` = NULL, + `remark` = NULL +WHERE `menu_id` = 1759; + +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 (2013, '新增入院产品', 1819, 3, 'supplier/products/supProductsAddDi', 'supplier/products/supProductsAddDi', + NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-17 10:04:07', NULL, NULL, NULL); UPDATE sys_custom_config SET `businessType` = 'supProductsAddDi', `remark` = '新增入院产品', `type` = '1', `handleChangeFuc` = NULL WHERE `id` = 22; INSERT ignore INTO sys_custom_config(`id`, `businessType`, `remark`, `type`, `handleChangeFuc`) VALUES (84, 'supProductsOptinDi', '选入入院产品', '1', NULL);