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

扫码问题修改

Browse Source
workplace
yewj 11 months ago
parent 8d06717f05
commit b424a12df9
5 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java
Unescape Escape View File

@ -28,4 +28,6 @@ public class CollectOrderCodeManRequest extends ListPageRequest {
private Long updateUser;
private Long bizIdFk;
}

15
src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
Unescape Escape View File

@ -97,6 +97,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
String userIds = customerService.getUserId() + "";
SysWorkplace workPlace = sysWorkPlaceService.getWorkplace(addTagCodeReqeust.getWorkPlaceCode());
if (workPlace == null) throw new JsonException(500, "请先选择工位");
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(workPlace.getWorkplaceId(), addTagCodeReqeust.getBusType());
IoCollectOrderBiz collectOrderBiz = null;
IoCollectOrder collectOrder = null;
@ -116,11 +119,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(addTagCodeReqeust.getBillNo());
//2.校验是否处方单UDI码
if (IntUtil.value(workPlace.getOperationType()) == WorkOperType.TYPE_GEN_ORDER) {
if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_GEN_ORDER) {
if (StrUtil.isEmpty(addTagCodeReqeust.getBillNo())) {
String orderNo = gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"));
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(workPlace.getWorkplaceId(), addTagCodeReqeust.getBusType());
collectOrder = IoCollectOrder.builder()
.billNo(orderNo)
.busType(sysWorkplaceDocumentEntity.getDocumentTypeCode())
@ -147,7 +148,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
collectOrderBizService.saveOrUpdate(collectOrderBiz);
} else if (IntUtil.value(workPlace.getOperationType()) == WorkOperType.TYPE_VAIL_BATCH) {
} else if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_VAIL_BATCH) {
collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo());
if (collectOrder == null)
throw new JsonException(500, "单据不存在！");
@ -160,7 +161,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
collectOrderBiz = vailByBatchNo(udiRelevanceResponses, collectOrderBizs, udiEntity);
switch (workPlace.getCheckInsert()) {
switch (sysWorkplaceDocumentEntity.getCheckInsert()) {
case 1: //插入
if (collectOrderBiz == null) {
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
@ -203,7 +204,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
}
} else if (IntUtil.value(workPlace.getOperationType()) == WorkOperType.TYPE_UNVAIL_BATCH) {
} else if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_UNVAIL_BATCH) {
collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo());
if (collectOrder == null)
throw new JsonException(500, "单据不存在！");
@ -215,7 +216,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
//按单不校验三期
collectOrderBiz = vailNoBatchNo(udiRelevanceResponses, collectOrderBizs, udiEntity);
switch (workPlace.getCheckInsert()) {
switch (sysWorkplaceDocumentEntity.getCheckInsert()) {
case 1: //插入
if (collectOrderBiz == null) {
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);

16
src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
Unescape Escape View File

@ -240,15 +240,19 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
List<IoCollectOrder> collectOrderList = new ArrayList<>();
for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) {
BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByFromCode(String.valueOf(basicSkPrescribeEntity.getAddr()));
if (collectBustypeEntity == null)
continue;
// BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByFromCode(String.valueOf(basicSkPrescribeEntity.getAddr()));
// if (collectBustypeEntity == null)
// continue;
if (collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) {
continue;
}
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(basicSkPrescribeEntity.getAddr());
if (sysWorkplaceDocumentEntity == null)
continue;
//自动分配工位
final Long[] defaultWorkplace = {null};
List<SysWorkplaceResponse> sysWorkplaces = sysWorkplaceService.getAllByBusType(collectBustypeEntity.getFromDocumentType());
List<SysWorkplaceResponse> sysWorkplaces = sysWorkplaceService.getAllByBusType(basicSkPrescribeEntity.getAddr());
if (CollUtil.isNotEmpty(sysWorkplaces)) {
if (sysWorkplaces.size() == 1) {
defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId();
@ -276,8 +280,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
IoCollectOrder collectOrder = IoCollectOrder.builder()
.billNo(basicSkPrescribeEntity.getCode())
.busType(collectBustypeEntity.getFromDocumentType())
.fromType(collectBustypeEntity.getFromType())
.busType(sysWorkplaceDocumentEntity.getDocumentTypeCode())
.fromType("HIS系统")
.fromCorp(basicSkPrescribeEntity.getSickerCode())
.workPlaceCode(defaultWorkplace[0])
.billTime(MsDateUtil.localToDate(basicSkPrescribeEntity.getCreateTime()))

19
src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml
Unescape Escape View File

@ -4,16 +4,17 @@
<select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderCodeAutoRequest"
resultType="com.glxp.api.res.collect.CollectOrderCodeAutoResponse">
SELECT icoca.*,
bp.nameCode,
bp.cpmctymc,
bp.ggxh,
bp.zczbhhzbapzbh,
bp.manufactory
bp.nameCode,
bp.cpmctymc,
COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
bp.bzgg,
bp.zczbhhzbapzbh,
bp.manufactory
FROM io_collect_order_code_auto icoca
left join io_split_code isc
on icoca.codeIdFk = isc.id
left join basic_udirel bu on icoca.relId = bu.id
left join basic_products bp on bu.uuid = bp.uuid
left join io_split_code isc
on icoca.codeIdFk = isc.id
left join basic_udirel bu on icoca.relId = bu.id
left join basic_products bp on bu.uuid = bp.uuid
<where>
<if test="codeIdFk != '' and codeIdFk != null">
AND icoca.codeIdFk = #{codeIdFk}

16
src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml
Unescape Escape View File

@ -4,13 +4,14 @@
<select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderCodeManRequest"
resultType="com.glxp.api.res.collect.CollectOrderCodeManResponse">
SELECT icocm.*,
bp.cpmctymc,
bp.ggxh,
bp.zczbhhzbapzbh,
bp.manufactory
bp.cpmctymc,
COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
bp.bzgg,
bp.zczbhhzbapzbh,
bp.manufactory
FROM io_collect_order_code_man icocm
left join basic_udirel bu on icocm.relId = bu.id
left join basic_products bp on bu.uuid = bp.uuid
left join basic_udirel bu on icocm.relId = bu.id
left join basic_products bp on bu.uuid = bp.uuid
<where>
<if test="orderIdFk != '' and orderIdFk != null">
AND icocm.orderIdFk = #{orderIdFk}
@ -21,6 +22,9 @@
<if test="relId != null">
AND icocm.relId = #{relId}
</if>
<if test="bizIdFk != null">
AND icocm.bizIdFk = #{bizIdFk}
</if>
</where>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save