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

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

Browse Source
dev_no_inv
zane 1 year ago
parent f99f2da6b6 787e9f220c
commit 14a83be21d
8 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java
Unescape Escape View File

@ -137,8 +137,8 @@ public class SysWorkplaceController extends BaseController {
@PostMapping("/udiwms/sysWorkplace/updateWorkplace")
public BaseResponse updateWorkplace(@RequestBody SysWorkplace sysWorkplace) {
sysWorkplace.setUpdateTime(new Date());
boolean save = sysWorkplaceService.updateById(sysWorkplace);
sysWorkplace.setUpdateTime(new Date());;
boolean save = sysWorkplaceService.updateWorkplace(sysWorkplace);
if (!save) {
return ResultVOUtils.error("更新错误");
}

3
src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
Unescape Escape View File

@ -327,6 +327,9 @@ public class IoCollectOrderController extends BaseController {
collectOrderBiz.setScanActCount(0);
collectOrderBiz.setTempSplitCount(0);
collectOrderBiz.setTempWorkPlaceCount(0);
if (collectOrderBiz.getCount() == 0) {
collectOrderBizService.removeById(collectOrderBiz.getId());
}
}
collectOrderBizService.updateBatchById(collectOrderBizs);
}

1
src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
Unescape Escape View File

@ -138,6 +138,7 @@ public class CollectOrderRequest extends ListPageRequest {
private String startTime;
private String endTime;
private String keyWord;
private List<String> documentTypeCodes;

5
src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
Unescape Escape View File

@ -169,6 +169,11 @@ public class IoCollectOrderResponse {
*/
private String errorMsg;
/**
* 第三地业务类型名称
*/
private String actionName;
public String getFromName() {
if (StrUtil.isNotEmpty(fromCorpName))

28
src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java
Unescape Escape View File

@ -7,9 +7,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.auth.SysWorkplaceDao;
import com.glxp.api.entity.auth.SysWorkplace;
import com.glxp.api.exception.JsonException;
import com.glxp.api.req.auth.SysWorkplaceRequest;
import com.glxp.api.req.basic.WorkBindBusTypeRequest;
import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
import com.glxp.api.res.basic.SysWorkplaceResponse;
import com.glxp.api.service.basic.SysWorkplaceDocumentService;
import org.apache.poi.ss.formula.functions.Offset;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Collections;
@ -25,6 +31,9 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
@Resource
SysWorkplaceDao sysWorkplaceDao;
@Resource
private SysWorkplaceDocumentService sysWorkplaceDocumentService;
public Long maxWorkplaceId() {
return super.baseMapper.selectMaxWorkplaceId();
}
@ -53,4 +62,23 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
// return super.baseMapper.selectList(
// new LambdaQueryWrapper<SysWorkplace>().eq(SysWorkplace::getOrderId, code));
}
@Transactional(rollbackFor = Exception.class)
public boolean updateWorkplace(SysWorkplace sysWorkplace) {
if (sysWorkplace.getWorkplaceStatus() == 0 ){
//更改停用 判断是否含有工位类型
WorkBindBusTypeRequest request = new WorkBindBusTypeRequest();
request.setWorkplaceCode(sysWorkplace.getWorkplaceId());
List<SysWorkplaceDocumentResponse> page = sysWorkplaceDocumentService.filterListByWorkplace(request);
if (page != null || page.size() >0 ){
throw new JsonException(500,"当前工位已作业，请解绑之后暂停工位");
}
}
boolean b = this.updateById(sysWorkplace);
if (!b){
return false;
}
return true;
}
}

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

@ -216,7 +216,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
case 3: //提醒是否插入
if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
if (collectOrderBiz == null)
throw new JsonException(502, "非此单据追溯码，是否继续添加！");
throw new JsonException(502, addTagCodeReqeust.getCode() + "非此单据追溯码，是否继续添加！");
int count1 = IntUtil.value(collectOrderBiz.getScanCount()) + 1;
int actCount1 = 0;
if (IntUtil.value(collectOrder.getOrderCirType()) == 1) {
@ -231,7 +231,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
throw new JsonException(502, collectOrderBiz.getCpmctymc() + "拆零数量还有剩余，是否继续扫码？");
}
}
throw new JsonException(502, "扫码数量超出，是否继续添加！");
throw new JsonException(502, collectOrderBiz.getCpmctymc() +"扫码数量超出，是否继续添加！");
}
collectOrderBiz.setScanCount(count1);
collectOrderBiz.setScanActCount(actCount1);
@ -301,7 +301,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
if (collectOrderBiz == null)
throw new JsonException(502, "非此单据追溯码，是否继续添加？");
throw new JsonException(502, addTagCodeReqeust.getCode() + "非此单据追溯码，是否继续添加？");
int count1 = IntUtil.value(collectOrderBiz.getScanCount()) + 1;
int actCount1 = 0;
if (IntUtil.value(collectOrder.getOrderCirType()) == 1) {

2
src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
Unescape Escape View File

@ -23,6 +23,7 @@
ico.fromCorpName,
ico.tagMsg,
sys_workplace_document.busName busTypeName,
thr_bustype_origin.name actionName,
sw.workplaceName,
ico.id,
ico.orderTime,
@ -32,6 +33,7 @@
row_number() over ( order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc ) as orderSequence
FROM io_collect_order ico
left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
left join thr_bustype_origin on sys_workplace_document.documentTypeCode = thr_bustype_origin.action
left join basic_corp bc on ico.fromCorp = bc.erpId
left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId
<where>

5
src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
Unescape Escape View File

@ -24,6 +24,7 @@
ico.fromCorpName,
ico.tagMsg,
sys_workplace_document.busName busTypeName,
thr_bustype_origin.name actionName,
sw.workplaceName,
ico.id,
ico.orderTime,
@ -33,6 +34,7 @@
row_number() over ( order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc ) as orderSequence
FROM io_collect_order_origin ico
left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
left join thr_bustype_origin on sys_workplace_document.documentTypeCode = thr_bustype_origin.action
left join basic_corp bc on ico.fromCorp = bc.erpId
left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId
<where>
@ -70,6 +72,7 @@
AND (
ico.billNo like concat('%', #{unionKey}, '%')
or ico.fromCorp like concat('%', #{unionKey}, '%')
or ico.fromType like concat('%', #{unionKey}, '%')
or ico.fromCorpName like concat('%', #{unionKey}, '%')
or ico.backupOrderRemark1 like concat('%', #{unionKey}, '%')
or ico.backupOrderRemark2 like concat('%', #{unionKey}, '%')
@ -78,8 +81,6 @@
or ico.backupOrderRemark5 like concat('%', #{unionKey}, '%')
or ico.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
</if>
<if test="tagStatusList != null and tagStatusList.size() > 0">
and tagStatus in
<foreach collection="tagStatusList" item="item" index="index" separator="," open="(" close=")">

Write Preview
Loading…
Cancel
Save