UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

好词啊字典，发票等相关修改

Browse Source
dev_ksck_axxyy
anthonywj 9 months ago
parent 51a8ef9976
commit 9289dfa341
9 changed files with 128 additions and 94 deletions
Show Stats Download Patch File Download Diff File

11
src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
Unescape Escape View File

@ -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<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;

8
src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
Unescape Escape View File

@ -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<IoOrderInvoiceResponse> orderInvoiceEntities = ioOrderInvoiceService.filterGroupBy(orderInvoiceRequest);
PageInfo<IoOrderInvoiceResponse> pageInfo = new PageInfo<>(orderInvoiceEntities);
return ResultVOUtils.page(pageInfo);

1
src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
Unescape Escape View File

@ -95,6 +95,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
/**
* 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
*/
@TableField(value = "codeCheck")
private Integer codeCheck;
}

3
src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
Unescape Escape View File

@ -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";

6
src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
Unescape Escape View File

@ -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,
@ -148,7 +150,7 @@
<if test="purType != '' and purType != null">
AND basic_udirel.purType = #{purType}
</if>
<if test="codeCheck != '' and codeCheck != null">
<if test="codeCheck != null">
AND basic_products.requireScanCode = #{codeCheck}
</if>
<if test="unionCode != '' and unionCode != null">

15
src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
Unescape Escape View File

@ -37,8 +37,7 @@
<select id="filterGroupBy" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
SELECT
ic.id,
SELECT ic.id,
ic.orderIdFk,
ic.bindRlFk,
ic.batchNo,
@ -69,6 +68,7 @@
LEFT JOIN basic_udirel bu
ON bu.id = ic.bindRlFk
LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
left join io_order ioo on ioo.billNo = ic.orderIdFk
<where>
<if test="invoiceCode != null and invoiceCode != ''">
AND ic.invoiceCode = #{invoiceCode}
@ -82,6 +82,9 @@
<if test="invoiceEncode != null and invoiceEncode != ''">
AND ic.invoiceEncode = #{invoiceEncode}
</if>
<if test="supId != null and supId != ''">
AND ioo.customerId = #{supId}
</if>
</where>
GROUP BY ic.invoiceEncode
order by ic.updateTime desc
@ -90,8 +93,7 @@
<select id="filterInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
SELECT
io.nameCode,
SELECT io.nameCode,
ic.id,
ic.orderIdFk,
ic.bindRlFk,
@ -164,9 +166,4 @@
</where>
group by io.billNo;
</select>
</mapper>

5
src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
Unescape Escape View File

@ -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

2
src/main/resources/schemas/schema_v2.3.sql
Unescape Escape View File

@ -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',

39
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -629,14 +629,37 @@ 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',
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;

Write Preview
Loading…
Cancel
Save