jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

成都装车单打印，临时提交

Browse Source
uat-temp-nht-chengdu-loading
jason 2 months ago
parent a5290282ac
commit 27fc494cb7
8 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java
Unescape Escape View File

@ -16,5 +16,5 @@ public interface IMesLoadingListService extends IBaseMesService<MesLoadingList>
@ApiOperation("根据发运单号查询装车单信息")
MesLoadingList getMesLoadingListByShippingCode(String organizeCode, String shippingCode);
ResultBean doMesMesLoadingListPrint(List<Long> ids);
ResultBean doMesMesLoadingListPrint(List<Long> ids, boolean reprint);
}

6
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingListService;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.ext.mes.pojo.model.PrintDataRequest;
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList;
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@ -27,10 +28,11 @@ public class MesLoadingListController extends BaseMesController<MesLoadingList>
@PostMapping(value = "/doPrint")
@ApiOperation(value = "打印未打印发运单后修改状态")
public ResultBean doMesMesLoadingListPrint(@RequestBody List<Long> ids) {
public ResultBean doMesMesLoadingListPrint(@RequestBody PrintDataRequest request) {
try {
boolean reprint = request.getIsReprint() != null ? request.getIsReprint() : false;
// 数据校验
return loadingListService.doMesMesLoadingListPrint(ids);
return loadingListService.doMesMesLoadingListPrint(request.getIds(), reprint);
} catch (ImppBusiException e) {
return ResultBean.fail(e).build();
} catch (Exception e) {

4
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java
Unescape Escape View File

@ -267,7 +267,7 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
}
@Override
public ResultBean doMesMesLoadingListPrint(List<Long> ids) {
public ResultBean doMesMesLoadingListPrint(List<Long> ids, boolean reprint) {
String organizeCode = AuthUtilExt.getOrganizeCode();
MesConfig config = configService.getConfigByCfgCode(MesExtConstWords.LOADING_LIST_PRINT_TEMPLATE, organizeCode);
if (null == config || StringUtils.isEmpty(config.getCfgValue())) {
@ -288,7 +288,7 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
organizeCode, loadingLists.size(), JSONObject.toJSONString(loadingLists), Thread.currentThread().getName());
IPrintTemplateStrategyService printStrategyService = (IPrintTemplateStrategyService) SpringContextsUtil.getBean(labelTemplate.getMethodCode());
ResultBean resultBean = printStrategyService.execute(loadingLists);
ResultBean resultBean = printStrategyService.execute(loadingLists, reprint);
log.info("工厂{}排序发运打印 --- 封装打印数据完成 --- {}", organizeCode, Thread.currentThread().getName());

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/IPrintTemplateStrategyService.java
Unescape Escape View File

@ -29,7 +29,7 @@ public interface IPrintTemplateStrategyService {
MesProduceSnPrintModel execute(GenSerialNoModel model, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule);
@ApiOperation(value = "装车单")
default ResultBean execute(List<MesLoadingList> loadingLists) {
default ResultBean execute(List<MesLoadingList> loadingLists, boolean reprint) {
return null;
}
}

13
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/loadingList/ChengDuLoadingListPrintStrategy.java
Unescape Escape View File

@ -6,6 +6,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
import cn.estsh.i3plus.ext.mes.pojo.model.ChengDuLoadingListDetailPrintModel;
import cn.estsh.i3plus.ext.mes.pojo.model.ChengDuLoadingListPrintModel;
import cn.estsh.i3plus.ext.mes.pojo.model.MesProduceSnPrintModel;
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
@ -63,10 +64,10 @@ public class ChengDuLoadingListPrintStrategy implements IPrintTemplateStrategySe
}
@Override
public ResultBean execute(List<MesLoadingList> loadingLists) {
public ResultBean execute(List<MesLoadingList> loadingLists, boolean reprint) {
List<ChengDuLoadingListPrintModel> modelList = new ArrayList<>();
for (MesLoadingList loadingList : loadingLists) {
ChengDuLoadingListPrintModel model = getPrintData(loadingList);
ChengDuLoadingListPrintModel model = getPrintData(loadingList, reprint);
if (model != null) {
modelList.add(model);
}
@ -74,7 +75,7 @@ public class ChengDuLoadingListPrintStrategy implements IPrintTemplateStrategySe
return ResultBean.success("装车单打印成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(modelList);
}
private ChengDuLoadingListPrintModel getPrintData(MesLoadingList loadingList) {
private ChengDuLoadingListPrintModel getPrintData(MesLoadingList loadingList, boolean reprint) {
final String organizeCode = AuthUtilExt.getOrganizeCode();
final String userName = AuthUtilExt.getUserName();
@ -155,6 +156,12 @@ public class ChengDuLoadingListPrintStrategy implements IPrintTemplateStrategySe
loadingList.setLastPrintUser(userName);
ConvertBean.serviceModelUpdate(loadingList, userName);
loadingListRDao.update(loadingList);
if (reprint) {
model.setRePrintDatetime(TimeTool.getNowTime(MesExtConstWords.DATETIME_FORMAT_SINGLE_SLASH));
model.setRePrintUser(userName);
model.setIsRePrint("重打印");
}
return model;
}
}

10
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ChengDuLoadingListPrintModel.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.ext.mes.pojo.model;
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -17,6 +18,15 @@ import java.util.List;
@ApiModel("成都装车单打印")
public class ChengDuLoadingListPrintModel {
@ApiModelProperty("是否重打印")
private String isRePrint = MesExtConstWords.EMPTY;
@ApiModelProperty("重打印操作人")
private String rePrintUser = MesExtConstWords.EMPTY;
@ApiModelProperty("重打印时间")
private String rePrintDatetime = MesExtConstWords.EMPTY;
@ApiModelProperty("车牌号")
private String truckNo;

22
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/PrintDataRequest.java
Unescape Escape View File

@ -0,0 +1,22 @@
package cn.estsh.i3plus.ext.mes.pojo.model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Description : 打印前端请求参数
* @Reference :
* @Author : jason.niu
* @CreateDate 2025/3/15 15:48
* @Modify:
**/
@Data
public class PrintDataRequest {
@ApiModelProperty("是否为补打印")
private Boolean isReprint;
@ApiModelProperty("打印对象ID")
private List<Long> ids;
}

2
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
Unescape Escape View File

@ -320,6 +320,8 @@ public class MesExtConstWords {
//时间类型
public static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
//时间类型
public static final String DATETIME_FORMAT_SINGLE_SLASH = "yyyy/MM/dd HH:mm:ss";
//时间类型
public static final String DATETIME_TRUNCATE_MINUTE_FORMAT = "yyyy-MM-dd HH";
//时间类型
public static final String TIME_TRUNCATE_SECOND_FORMAT = "HH:mm";

Write Preview
Loading…
Cancel
Save