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); companyProductRelevanceRequest.setDiType(1);
} }
//包装采购类型校验 //校验是否需要扫码
if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getAction())) { if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getAction())) {
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(companyProductRelevanceRequest.getAction()); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(companyProductRelevanceRequest.getAction());
//是否校验产品采购类型 ：1：校验；2.无需校验 //是否校验产品采购类型 ：1：校验；2.无需校验
if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) {
companyProductRelevanceRequest.setPurType(IntUtil.value(bussinessTypeEntity.getActionType())); companyProductRelevanceRequest.setPurType(IntUtil.value(bussinessTypeEntity.getActionType()));
} }
//是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品 //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 1) {
companyProductRelevanceRequest.setCodeCheck(1); companyProductRelevanceRequest.setCodeCheck(1);
}else if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 2) { } else if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 2) {
companyProductRelevanceRequest.setCodeCheck(2); companyProductRelevanceRequest.setCodeCheck(0);
} else {
companyProductRelevanceRequest.setCodeCheck(null);
} }
} }
List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null; List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;

18
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.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; 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.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderDetailCodeService; import com.glxp.api.service.inout.IoOrderDetailCodeService;
import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
import com.glxp.api.util.CustomUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -38,7 +40,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
@RestController @RestController
public class IoOrderInvoiceController { public class IoOrderInvoiceController extends BaseController {
@Resource @Resource
IoOrderInvoiceService ioOrderInvoiceService; IoOrderInvoiceService ioOrderInvoiceService;
@Resource @Resource
@ -70,6 +72,10 @@ public class IoOrderInvoiceController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/group/invoice") @GetMapping("/udiwms/inout/order/group/invoice")
public BaseResponse filterGroup(IoOrderInvoiceRequest orderInvoiceRequest) { public BaseResponse filterGroup(IoOrderInvoiceRequest orderInvoiceRequest) {
String supId = getCustomerId();
if (!supId.equals("110")) {
orderInvoiceRequest.setSupId(supId);
}
List<IoOrderInvoiceResponse> orderInvoiceEntities = ioOrderInvoiceService.filterGroupBy(orderInvoiceRequest); List<IoOrderInvoiceResponse> orderInvoiceEntities = ioOrderInvoiceService.filterGroupBy(orderInvoiceRequest);
PageInfo<IoOrderInvoiceResponse> pageInfo = new PageInfo<>(orderInvoiceEntities); PageInfo<IoOrderInvoiceResponse> pageInfo = new PageInfo<>(orderInvoiceEntities);
return ResultVOUtils.page(pageInfo); return ResultVOUtils.page(pageInfo);
@ -162,7 +168,7 @@ public class IoOrderInvoiceController {
@Log(title = "发票管理", businessType = BusinessType.UPDATE) @Log(title = "发票管理", businessType = BusinessType.UPDATE)
public BaseResponse uploadInvoice(@RequestBody IoOrderInvoiceEntity ioOrderInvoice) { public BaseResponse uploadInvoice(@RequestBody IoOrderInvoiceEntity ioOrderInvoice) {
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList=ioOrderInvoiceService.list(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode",ioOrderInvoice.getInvoiceEncode())); List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", ioOrderInvoice.getInvoiceEncode()));
for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) { for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) {
ioOrderInvoiceEntity.setInvoiceDate(ioOrderInvoice.getInvoiceDate()); ioOrderInvoiceEntity.setInvoiceDate(ioOrderInvoice.getInvoiceDate());
ioOrderInvoiceEntity.setPrice(ioOrderInvoice.getPrice()); ioOrderInvoiceEntity.setPrice(ioOrderInvoice.getPrice());
@ -185,7 +191,7 @@ public class IoOrderInvoiceController {
if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode())) if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode()))
return ResultVOUtils.error(500, "发票编码不能为空"); return ResultVOUtils.error(500, "发票编码不能为空");
boolean b = ioOrderInvoiceService.remove(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", deleteRequest.getInvoiceEncode()).eq("orderIdFk",deleteRequest.getBillNo())); boolean b = ioOrderInvoiceService.remove(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", deleteRequest.getInvoiceEncode()).eq("orderIdFk", deleteRequest.getBillNo()));
if (b) if (b)
return ResultVOUtils.success("删除成功！"); return ResultVOUtils.success("删除成功！");
else else
@ -199,10 +205,10 @@ public class IoOrderInvoiceController {
return ResultVOUtils.error(500, "发票编码不能为空"); return ResultVOUtils.error(500, "发票编码不能为空");
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", deleteRequest.getInvoiceEncode())); List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", deleteRequest.getInvoiceEncode()));
if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList) && ioOrderInvoiceEntityList.size()>0){ if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList) && ioOrderInvoiceEntityList.size() > 0) {
return ResultVOUtils.error(999,"发票编码已存在！"); return ResultVOUtils.error(999, "发票编码已存在！");
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }

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:只允许录入不扫码产品 * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
*/ */
@TableField(value = "codeCheck")
private Integer 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; private String endTime;
//供应商ID
private String supId;
public static final String COL_ID = "id"; public static final String COL_ID = "id";
public static final String COL_ORDERIDFK = "orderIdFk"; public static final String COL_ORDERIDFK = "orderIdFk";

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

@ -46,7 +46,9 @@
basic_udirel.lockStatus, basic_udirel.lockStatus,
basic_udirel.mainId, basic_udirel.mainId,
basic_udirel.isAdavence, 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.lowStockNum,
basic_udirel.overStockNum, basic_udirel.overStockNum,
basic_udirel.recentDateTime, basic_udirel.recentDateTime,
@ -118,10 +120,10 @@
basic_udirel.groupBuy, basic_udirel.groupBuy,
basic_udirel.id as uid, basic_udirel.id as uid,
basic_corp.name companyName, basic_corp.name companyName,
basic_products.catalogname1, basic_products.catalogname1,
basic_products.catalogname2, basic_products.catalogname2,
basic_products.catalogname3, basic_products.catalogname3,
basic_products.matrial basic_products.matrial
FROM company_product_relevance FROM company_product_relevance
inner JOIN basic_udirel inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id ON company_product_relevance.udiRlIdFk = basic_udirel.id
@ -134,7 +136,7 @@
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%') AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
</if> </if>
<if test="mainId != '' and mainId != null"> <if test="mainId != '' and mainId != null">
AND basic_udirel.mainId LIKE concat('%',#{mainId}, '%') AND basic_udirel.mainId LIKE concat('%', #{mainId}, '%')
</if> </if>
<if test="cpmctymc != '' and cpmctymc != null"> <if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat(#{cpmctymc}, '%') AND cpmctymc LIKE concat(#{cpmctymc}, '%')
@ -148,7 +150,7 @@
<if test="purType != '' and purType != null"> <if test="purType != '' and purType != null">
AND basic_udirel.purType = #{purType} AND basic_udirel.purType = #{purType}
</if> </if>
<if test="codeCheck != '' and codeCheck != null"> <if test="codeCheck != null">
AND basic_products.requireScanCode = #{codeCheck} AND basic_products.requireScanCode = #{codeCheck}
</if> </if>
<if test="unionCode != '' and unionCode != null"> <if test="unionCode != '' and unionCode != null">

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

@ -37,38 +37,38 @@
<select id="filterGroupBy" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest" <select id="filterGroupBy" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse"> resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
SELECT SELECT ic.id,
ic.id, ic.orderIdFk,
ic.orderIdFk, ic.bindRlFk,
ic.bindRlFk, ic.batchNo,
ic.batchNo, ic.productDate,
ic.productDate, ic.expireDate,
ic.expireDate, ic.machineNo,
ic.machineNo, ic.invoiceCode,
ic.invoiceCode, ic.invoiceEncode,
ic.invoiceEncode, ic.invoiceDate,
ic.invoiceDate, ic.updateTime,
ic.updateTime, ic.createUser,
ic.createUser, ic.createTime,
ic.createTime, ic.updateUser,
ic.updateUser, ic.remark,
ic.remark, ic.licenseUrl,
ic.licenseUrl, ic.bizIdFk,
ic.bizIdFk, io.coName,
io.coName, ic.price,
ic.price, io.spec,
io.spec, bp.measname,
bp.measname, io.manufacturer,
io.manufacturer, io.certCode,
io.certCode, io.reCount,
io.reCount, io.count,
io.count, io.nameCode
io.nameCode
FROM io_order_invoice ic FROM io_order_invoice ic
INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk
LEFT JOIN basic_udirel bu LEFT JOIN basic_udirel bu
ON bu.id = ic.bindRlFk ON bu.id = ic.bindRlFk
LEFT JOIN basic_products bp ON bu.uuid = bp.uuid LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
left join io_order ioo on ioo.billNo = ic.orderIdFk
<where> <where>
<if test="invoiceCode != null and invoiceCode != ''"> <if test="invoiceCode != null and invoiceCode != ''">
AND ic.invoiceCode = #{invoiceCode} AND ic.invoiceCode = #{invoiceCode}
@ -82,6 +82,9 @@
<if test="invoiceEncode != null and invoiceEncode != ''"> <if test="invoiceEncode != null and invoiceEncode != ''">
AND ic.invoiceEncode = #{invoiceEncode} AND ic.invoiceEncode = #{invoiceEncode}
</if> </if>
<if test="supId != null and supId != ''">
AND ioo.customerId = #{supId}
</if>
</where> </where>
GROUP BY ic.invoiceEncode GROUP BY ic.invoiceEncode
order by ic.updateTime desc order by ic.updateTime desc
@ -90,38 +93,37 @@
<select id="filterInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest" <select id="filterInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse"> resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
SELECT SELECT io.nameCode,
io.nameCode, ic.id,
ic.id, ic.orderIdFk,
ic.orderIdFk, ic.bindRlFk,
ic.bindRlFk, ic.batchNo,
ic.batchNo, ic.productDate,
ic.productDate, ic.expireDate,
ic.expireDate, ic.machineNo,
ic.machineNo, ic.invoiceCode,
ic.invoiceCode, ic.invoiceEncode,
ic.invoiceEncode, ic.invoiceDate,
ic.invoiceDate, ic.updateTime,
ic.updateTime, ic.createUser,
ic.createUser, ic.createTime,
ic.createTime, ic.updateUser,
ic.updateUser, ic.remark,
ic.remark, ic.licenseUrl,
ic.licenseUrl, ic.bizIdFk,
ic.bizIdFk, io.coName,
io.coName, io.price,
io.price, io.spec,
io.spec, bp.measname,
bp.measname, io.manufacturer,
io.manufacturer, io.certCode,
io.certCode, io.reCount,
io.reCount, io.count
io.count
FROM io_order_invoice ic FROM io_order_invoice ic
INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk
LEFT JOIN basic_udirel bu LEFT JOIN basic_udirel bu
ON bu.id = ic.bindRlFk ON bu.id = ic.bindRlFk
LEFT JOIN basic_products bp ON bu.uuid = bp.uuid LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
<where> <where>
<if test="orderIdFk != null and orderIdFk != ''"> <if test="orderIdFk != null and orderIdFk != ''">
AND ic.orderIdFk = #{orderIdFk} AND ic.orderIdFk = #{orderIdFk}
@ -164,9 +166,4 @@
</where> </where>
group by io.billNo; group by io.billNo;
</select> </select>
</mapper> </mapper>

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

@ -80,7 +80,7 @@
SELECT sup_product.id, SELECT sup_product.id,
sup_product.productId, sup_product.productId,
sup_product.enterpriseId, sup_product.enterpriseId,
sup_product.recordCode,
sup_product.recordProductName, sup_product.recordProductName,
sup_product.productManageType, sup_product.productManageType,
sup_product.recordPeopleName, sup_product.recordPeopleName,
@ -128,7 +128,8 @@
sup_manufacturer.companyName manufacturerName, sup_manufacturer.companyName manufacturerName,
sup_manufacturer.companyName, sup_manufacturer.companyName,
sup_manufacturer.agentName, sup_manufacturer.agentName,
basic_products.ggxh basic_products.ggxh,
basic_products.zczbhhzbapzbh recordCode
FROM sup_product FROM sup_product
inner join sup_company inner join sup_company
on sup_product.customerId = sup_company.customerId 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; 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', CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailHcType',

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

@ -629,15 +629,38 @@ CALL Pro_Temp_ColumnWork('device_upkeep', 'taskBillNo',
1); 1);
UPDATE auth_menu SET `menu_name` = '选入入院产品', `parent_id` = 1819, `order_num` = 3, `path` = 'supplier/products/supProductsOptinDi', CALL Pro_Temp_ColumnWork('basic_products', 'bzgg',
`component` = 'supplier/products/supProductsOptinDi', `query_param` = NULL, `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''包装规格''',
`visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-17 10:04:07', 1);
`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`, UPDATE auth_menu
`status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES SET `menu_name` = '选入入院产品',
(2013, '新增入院产品', 1819, 3, 'supplier/products/supProductsAddDi', 'supplier/products/supProductsAddDi', `parent_id` = 1819,
NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-17 10:04:07', NULL, NULL, NULL); `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; 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); INSERT ignore INTO sys_custom_config(`id`, `businessType`, `remark`, `type`, `handleChangeFuc`) VALUES (84, 'supProductsOptinDi', '选入入院产品', '1', NULL);

Write Preview
Loading…
Cancel
Save