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

Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo

Browse Source
dev_kcyj
anthonywj 1 year ago
parent 0c7e170101 b630f392f5
commit ec843e3b00
14 changed files with 94 additions and 16 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.glxp.api.annotation.CusRedissonAnnotation;
import com.glxp.api.constant.*;
import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.exception.JsonException;
import com.glxp.api.service.inout.impl.IoCodeService;
import com.glxp.api.service.inv.impl.InvProductDetailService;
import org.springframework.beans.BeanUtils;
@ -397,7 +398,15 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(500, "单据只允许录入" + msg + ",当前录入产品为" + msg2 + ",请检查后重试！");
}
if (udiInfoEntity.getRequireScanCode() == 1){
// if (bussinessTypeEntity.getRequireScanCode() == 1) {
// if (udiInfoEntity.getRequireScanCode() != 1){
// return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！");
// }
// }else if (bussinessTypeEntity.getRequireScanCode() == 0){
// if (udiInfoEntity.getRequireScanCode() != 0){
// return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！");
// }
// }
//是否校验耗材材质 1：高值耗材；2.普通耗材
if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
}
@ -409,7 +418,6 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
}
}
}
String orderId = addOrderRequest.getBillNo();

16
src/main/java/com/glxp/api/controller/inout/IoOrderController.java
Unescape Escape View File

@ -97,6 +97,9 @@ public class IoOrderController extends BaseController {
@Resource
InvProductDetailService invProductDetailService;
@Resource
IoOrderInvoiceService ioOrderInvoiceService;
/**
* 查询单据列表
*
@ -132,7 +135,20 @@ public class IoOrderController extends BaseController {
if (!customerId.equals("110")) {
filterOrderRequest.setFromCorp(customerId);
}
//拿到当前单据
List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
//根据单据查询 发票号
for (IoOrderResponse ioOrderResponse : list){
FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(filterOrderDetailCodeRequest.getOrderIdFk());
String invoiceCodes = orderInvoiceEntities.stream()
.map(IoOrderInvoiceEntity::getInvoiceEncode)
.collect(Collectors.joining(","));
log.error("当前所有的发票号{}",invoiceCodes);
ioOrderResponse.setInvoiceCodes(invoiceCodes);
}
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}

30
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -219,16 +219,26 @@ public class IoOrderDetailBizController extends BaseController {
}
}
if (udiRelevanceResponse.getRequireScanCode() == 1) {
//是否校验耗材材质 1：高值耗材；2.普通耗材
if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
}
} else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
}
// if (bussinessTypeEntity.getCheckVailDate() != 4) {
// if (bussinessTypeEntity.getRequireScanCode() == 1) {
// if (udiRelevanceResponse.getRequireScanCode() != 1){
// return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！");
// }
// }else if (bussinessTypeEntity.getRequireScanCode() == 0){
// if (udiRelevanceResponse.getRequireScanCode() != 0){
// return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！");
// }
// }
// }
//是否校验耗材材质 1：高值耗材；2.普通耗材
if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
}
} else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
}
}

3
src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
Unescape Escape View File

@ -41,6 +41,7 @@ import com.glxp.api.util.BeanCopyUtils;
import com.glxp.api.util.JasperUtils;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.vo.dev.DeviceInfoVo;
import lombok.extern.slf4j.Slf4j;
import net.sf.jasperreports.engine.JRException;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Value;
@ -64,6 +65,7 @@ import java.util.*;
* 单据扫码明细查询接口
*/
@RestController
@Slf4j
public class IoOrderDetailResultController extends BaseController {
@Resource
IoOrderService orderService;
@ -345,6 +347,7 @@ public class IoOrderDetailResultController extends BaseController {
ioOrderDetailResultData.put("productDate", ioOrderDetailResultResponse.getProductDate() == null ? ' ' : ioOrderDetailResultResponse.getProductDate());
ioOrderDetailResultData.put("expireDate", ioOrderDetailResultResponse.getExpireDate() == null ? ' ' : ioOrderDetailResultResponse.getExpireDate());
ioOrderDetailResultData.put("coName", ioOrderDetailResultResponse.getCoName() == null ? ' ' : ioOrderDetailResultResponse.getCoName());
ioOrderDetailResultData.put("corpName", ioOrderDetailResultResponse.getCorpName()== null ? ' ' : ioOrderDetailResultResponse.getCorpName());
ioOrderDetailResultData.put("certCode", ioOrderDetailResultResponse.getCertCode() == null ? ' ' : ioOrderDetailResultResponse.getCertCode());
ioOrderDetailResultData.put("ylqxzcrbarmc", ioOrderDetailResultResponse.getYlqxzcrbarmc() == null ? ' ' : ioOrderDetailResultResponse.getYlqxzcrbarmc());
ioOrderDetailResultData.put("manufacturer", ioOrderDetailResultResponse.getManufacturer() == null ? ' ' : ioOrderDetailResultResponse.getManufacturer());

6
src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
Unescape Escape View File

@ -505,4 +505,10 @@ public class BasicBussinessTypeEntity {
@TableField(value = "devInType")
private Integer devInType;
/**
* 是否需要扫码 ：0：不需要；1.需要
*/
@TableField(value = "requireScanCode")
private Integer requireScanCode;
}

2
src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java
Unescape Escape View File

@ -16,6 +16,8 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest {
private String thirdSys;
private String thirdSysFk;
private String customerId;
private String thirdId;
private String thirdId1;
private String thirdId2;

1
src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
Unescape Escape View File

@ -60,4 +60,5 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
private String locInvName;
private String confirmStarTime; //发票确认起始日期
private String confirmEndTime; //发票确认结束日期
private String corpName;//供应商名字
}

2
src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
Unescape Escape View File

@ -193,7 +193,7 @@ public class FilterOrderRequest extends ListPageRequest {
private String orderBy;
private String uploadKey;
private String invoiceEncode;
private String invoiceEncode;//发票号
//联合备注字段查询
private String unionRemark;

3
src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
Unescape Escape View File

@ -214,6 +214,9 @@ public class IoOrderDetailResultResponse {
@ExcelProperty(value = "发票确认时间", index = 12)
private Date confirmTime;
@ExcelProperty(value = "配送商", index = 7)
private String corpName;
public String getFromName() {
if (StrUtil.isNotEmpty(fromCorpName))

2
src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
Unescape Escape View File

@ -264,6 +264,8 @@ public class IoOrderResponse {
private String checkPreInOrders;
private String invoiceCodes;//单据所有发票号
public String getFromName() {

14
src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
Unescape Escape View File

@ -290,7 +290,18 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
}
}
if (udiRelevanceResponse.getRequireScanCode() == 1){
// if (bussinessTypeEntity.getCheckVailDate() != 4) {
// if (bussinessTypeEntity.getRequireScanCode() == 1) {
// if (udiRelevanceResponse.getRequireScanCode() != 1){
// throw new JsonException("单据只允许录入需要扫码耗材" + ",请检查后重试！");
// }
// }else if (bussinessTypeEntity.getRequireScanCode() == 0){
// if (udiRelevanceResponse.getRequireScanCode() != 0){
// throw new JsonException("单据只允许录入不需要扫码耗材" + ",请检查后重试！");
// }
// }
// }
//是否校验耗材材质 1：高值耗材；2.普通耗材
if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
@ -301,7 +312,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
throw new JsonException("单据只允许录入普通耗材\" + \",请检查后重试！");
}
}
}
if (udiRelevanceResponse.getPurType() == 2) {

4
src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
Unescape Escape View File

@ -17,6 +17,7 @@
from io_order as io
left join auth_warehouse aw on aw.code = io.fromInvCode
left join basic_corp bc on bc.erpId = io.fromCorp
left join io_order_invoice ioi on ioi.orderIdFk = io.billNo
<if test="uploadKey != null and uploadKey != ''">
INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId
@ -51,6 +52,9 @@
<if test="fromCorp != null and fromCorp != ''">
AND io.fromCorp = #{fromCorp}
</if>
<if test="invoiceEncode != null and invoiceEncode != ''">
AND ioi.invoiceEncode like concat('%', #{invoiceEncode}, '%')
</if>
<if test="keyWord != null and keyWord != ''">
AND (
bc.name like concat('%', #{keyWord}, '%')

5
src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
Unescape Escape View File

@ -28,7 +28,7 @@
a1.mainAction,
a1.confirmTime as confirmTime,
a1.auditTime,
b1.NAME AS fromCorpName,
b1.NAME AS corpName,
(select name from auth_warehouse aw where aw.code = a1.fromInvCode) as fromInvName,
(SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
FROM io_order_detail_result a2
@ -75,6 +75,9 @@
<if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
AND a2.certCode like concat('%', #{zczbhhzbapzbh}, '%')
</if>
<if test="corpName != null and corpName != ''">
AND b1.name like concat('%', #{corpName}, '%')
</if>
<if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
</if>

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

@ -3691,3 +3691,13 @@ CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode',
1);
INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireScanCode',
'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''',
1);
INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41782, 68, '2', 1, 'invoiceEncode', '发票号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41780, 94, '2', 1, 'corpName', '供应商', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41781, 94, '1', 1, 'corpName', '供应商', 'text', NULL, NULL, NULL, 160, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

Write Preview
Loading…
Cancel
Save