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

发运打印

Browse Source
uat-temp-nht-2503130000-chengdu-shipping
王杰 4 months ago
parent 804b34cd56
commit 8cdb942b89
6 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File

12
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesLabelTemplateExtController.java
Unescape Escape View File

@ -1,10 +1,9 @@
package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesTemplateService;
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService;
import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
import cn.estsh.i3plus.mes.pcn.api.iservice.base.IConfigService;
import cn.estsh.i3plus.pojo.mes.bean.MesConfig;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ResultBean;
@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@Api("获取系统配置的模版信息")
@RestController
@ -39,8 +38,11 @@ public class MesLabelTemplateExtController {
ValidatorBean.checkNotNull(moduleCode, "模版配置代码不能为空");
}
if (!StringUtils.isEmpty(moduleCode)) {
MesConfig config = configService.getMesConfigByCfgCode(moduleCode, organizeCode);
if (null == config || StringUtils.isEmpty(config.getCfgValue())) templateCode = config.getCfgValue();
Map<String, String> configMap = configService.getConfigMapByCfgCode(moduleCode, organizeCode);
String templateCustomHtml = configMap.get(MesPcnExtConstWords.TEMPLATE_CUSTOM_HTML);
if (!StringUtils.isEmpty(templateCustomHtml)) return ResultBean.success("查询成功").setResultObject(templateCustomHtml);
String templateCfg = configMap.get(moduleCode);
if (!StringUtils.isEmpty(templateCfg)) templateCode = templateCfg;
}
ValidatorBean.checkNotNull(templateCode, "模版代码不能为空");
return ResultBean.success("查询成功").setResultObject(mesTemplateService.getMesLabelTemplate(templateCode, organizeCode));

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

@ -21,13 +21,13 @@ import java.util.List;
public interface IPrintTemplateStrategyService {
@ApiOperation(value = "单件条码")
default MesProduceSnPrintModel execute(GenSerialNoModel model , MesProduceSnPrintModel mesProduceSnPrintModel,
default MesProduceSnPrintModel execute(GenSerialNoModel model, MesProduceSnPrintModel mesProduceSnPrintModel,
MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep) {
return mesProduceSnPrintModel;
}
@ApiOperation(value = "发运单")
default ResultBean execute(MesShippingOrderManagement bean, List<MesShippingOrderManagement> pullingOrderInfos) {
default ResultBean execute(MesShippingOrderManagement bean, List<MesShippingOrderManagement> shippingOrderManagementList) {
return null;
}

3
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/CqCxSortShippingPrintStrategyService.java
Unescape Escape View File

@ -83,6 +83,7 @@ public class CqCxSortShippingPrintStrategyService extends SortShippingDispatchSt
MesSortShippingPrintForCqLxModel result = new MesSortShippingPrintForCqLxModel();
BeanUtils.copyProperties(sheetJis.get(0), result);
result.setShippingCode(shippingOrderManagement.getShippingCode());
if (shippingOrderManagement.getShippingCode().length() >= 4) {
result.setCarsNo(shippingOrderManagement.getShippingCode().substring(shippingOrderManagement.getShippingCode().length() - 4));
result.setDocNoOther(shippingOrderManagement.getShippingCode().substring(0, shippingOrderManagement.getShippingCode().length() - 4));
@ -95,6 +96,8 @@ public class CqCxSortShippingPrintStrategyService extends SortShippingDispatchSt
if (null == cimSeresSrmRunSheetJisDetail) continue;
MesSortShippingPrintForCqLxModel jisDetail = new MesSortShippingPrintForCqLxModel();
BeanUtils.copyProperties(cimSeresSrmRunSheetJisDetail, jisDetail);
//跟cc确认过可以直接写死
jisDetail.setFactoryCode("000003263");
jisDetail.setXh(index);
index ++;
result.addJisDetail(jisDetail);

12
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/CqLjSortShippingPrintStrategyService.java
Unescape Escape View File

@ -1,15 +1,11 @@
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.sortshipping.strategy;
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService;
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import cn.estsh.i3plus.pojo.mes.bean.MesConfig;
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
import cn.estsh.i3plus.pojo.mes.model.MesShippingOrderManagementDetailModelForLiJia;
@ -35,9 +31,6 @@ import java.util.stream.IntStream;
public class CqLjSortShippingPrintStrategyService extends SortShippingDispatchStrategyService implements IPrintTemplateStrategyService {
@Autowired
private IMesConfigService configService;
@Autowired
private MesCimCheryOrderRepository cimCheryOrderRepository;
@Override
@ -58,9 +51,6 @@ public class CqLjSortShippingPrintStrategyService extends SortShippingDispatchSt
@Override
public ResultBean execute(MesShippingOrderManagement bean, List<MesShippingOrderManagement> shippingOrderManagementList) {
MesConfig config = configService.getMesConfigNoError(bean.getOrganizeCode(), "SORT_SHIPMENT_PRINTS_FLAG_FOR_LI_JIA");
String cfgValue = (null == config || StringUtils.isEmpty(config.getCfgValue())) ? MesPcnExtConstWords.EMPTY : config.getCfgValue();
//维护了该参数，则执行礼嘉的新逻辑
List<MesShippingOrderManagementModelForLiJia> mainDataList = new ArrayList<>();
@ -116,7 +106,7 @@ public class CqLjSortShippingPrintStrategyService extends SortShippingDispatchSt
saveShippingOrderManagementList(shippingOrderManagementList);
return ResultBean.success("发运单打印成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(mainDataList).setResultObject(cfgValue);
return ResultBean.success("发运单打印成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(mainDataList);
}

13
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSortShippingPrintForCqLxModel.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.springframework.util.CollectionUtils;
@ -16,6 +17,18 @@ public class MesSortShippingPrintForCqLxModel implements Serializable {
private static final long serialVersionUID = -4576439891171509409L;
@ApiParam("是否重打印")
private String isRePrint = MesPcnExtConstWords.EMPTY;
@ApiParam("重打印操作人")
private String rePrintUser = MesPcnExtConstWords.EMPTY;
@ApiParam("重打印时间")
private String rePrintDatetime = MesPcnExtConstWords.EMPTY;
@ApiParam("发运单号")
private String shippingCode;
@ApiParam("流水线")
private String flowLine;

3
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
Unescape Escape View File

@ -905,4 +905,7 @@ public class MesPcnExtConstWords {
public static final String PART_PULL_PRINT_TEMPLATE = "PART_PULL_PRINT_TEMPLATE";
//排序发运全局打印配置
public static final String SORT_SHIPPING_PRINT_TEMPLATE = "SORT_SHIPPING_PRINT_TEMPLATE";
//由前端直接渲染模版的标志
public static final String TEMPLATE_CUSTOM_HTML = "TEMPLATE_CUSTOM_HTML";
}

Write Preview
Loading…
Cancel
Save