diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/OptionRecord.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/OptionRecord.java index 6f770ee5..aee0154a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/OptionRecord.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/OptionRecord.java @@ -3,25 +3,16 @@ package org.nl.common.utils; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import lombok.Getter; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.nl.common.publish.event.PublishEvent; -import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.system_manage.service.ql.IPdmQlOptionService; import org.nl.wms.system_manage.service.ql.dao.PdmQlOption; import org.nl.wms.system_manage.service.ql.dto.OptionRecordQuery; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.Map; import java.util.concurrent.ThreadPoolExecutor; /* diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/MetaDataHandler.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/MetaDataHandler.java new file mode 100644 index 00000000..6e9b4983 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/MetaDataHandler.java @@ -0,0 +1,45 @@ +package org.nl.config; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.stereotype.Component; + +import java.util.Date; + + +/** + * 自动填充公共字段 + */ +@Component +public class MetaDataHandler implements MetaObjectHandler +{ + /** + * 插入操作自动填充 + */ + @Override + public void insertFill(MetaObject metaObject) + { + //不一定有修改或删除字段，比如交易记录不能删除也不能修改 + if(metaObject.hasSetter("is_delete")) + { + metaObject.setValue("is_delete", 0); + } + if(metaObject.hasSetter("update_time")) + { + metaObject.setValue("update_time", new Date()); + } + metaObject.setValue("create_time", new Date()); + } + + /** + * 更新操作自动填充 + */ + @Override + public void updateFill(MetaObject metaObject) + { + if(metaObject.hasSetter("update_time")) + { + metaObject.setValue("update_time", new Date()); + } + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java index 45f53bc8..7da020f3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java @@ -137,7 +137,7 @@ public class WmsToSapServiceImpl implements WmsToSapService { } } sale_jo.setSale_code(row.getString("Vbeln")); - sale_jo.setSeq_no(row.getString("Posnr")); + sale_jo.setSeq_no(row.getInteger("Posnr")); sale_jo.setSale_type(row.getString("Auart")); String material_code = row.getString("Matnr").replaceAll("^(0+)", ""); //获取物料对应的物料标识 @@ -173,11 +173,10 @@ public class WmsToSapServiceImpl implements WmsToSapService { } else { sale_jo.setQty_unit_id(unit_jo.getMeasure_unit_id()); } - sale_jo.setPlandeliver_date(row.getString("Edatu")); + //sale_jo.setPlandeliver_date(row.getString("Edatu")); sale_jo.setCreate_id(SecurityUtils.getCurrentUserId()); - sale_jo.setCreate_time(DateUtil.now()); + sale_jo.setCreate_time(new Date()); sale_jo.setCreate_name(SecurityUtils.getCurrentNickName()); - sale_jo.setIs_delete("0"); if (need_update) { saleOrderService.updateById(sale_jo); } else { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java index a6c5e6d6..791dac56 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java @@ -57,7 +57,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ @Qualifier("meshandlerPool") private ThreadPoolExecutor pool; - private final RedisUtils redisUtils; @Autowired private IMdMeMaterialbaseService materialbaseService; @Autowired @@ -163,11 +162,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ WQLObject wo = WQLObject.getWQLObject("md_me_materialbase"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); - //子线程异步更新redis数据 - CompletableFuture updateMaterToRedis = CompletableFuture.runAsync(this::updateRedis, pool); - updateMaterToRedis.exceptionally((e) -> { - throw new BadRequestException("物料信息缓存redis失败"); - }); } @Override @@ -179,11 +173,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ materialbase.setUpdate_id(SecurityUtils.getCurrentUserId()); materialbase.setUpdate_name(SecurityUtils.getCurrentNickName()); materialbaseService.updateById(materialbase); - //子线程异步更新redis数据 - CompletableFuture updateMaterToRedis = CompletableFuture.runAsync(this::updateRedis, pool); - updateMaterToRedis.exceptionally((e) -> { - throw new BadRequestException("物料信息缓存redis失败"); - }); } @Override @@ -201,11 +190,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ param.put("update_time", DateUtil.now()); wo.update(param); } - //子线程异步更新redis数据 - CompletableFuture updateMaterToRedis = CompletableFuture.runAsync(this::updateRedis, pool); - updateMaterToRedis.exceptionally((e) -> { - throw new BadRequestException("物料信息缓存redis失败"); - }); } @Override @@ -328,11 +312,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ } } result.put("message", "导入成功！一共导入：" + rows.size() + "条数据！"); - //子线程异步更新redis数据 - CompletableFuture updateMaterToRedis = CompletableFuture.runAsync(this::updateRedis, pool); - updateMaterToRedis.exceptionally((e) -> { - throw new BadRequestException("物料信息缓存redis失败"); - }); return new JSONObject(); } @@ -353,9 +332,5 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ return newParentArray; } - public void updateRedis() { - JSONArray materialJsonArray = WQL.getWO("PDA_QUERY").addParam("flag", "5").process().getResultJSONArray(0); - List finalMaterialList = materialJsonArray.toJavaList(MaterialDto.class); - redisUtils.set("hl:cacheLineHand:materialBase:mid", finalMaterialList); - } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java index 831a25f3..9df6685a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java @@ -58,6 +58,10 @@ public class MpsSaleOrderController { } + /** + *导入订单 + */ + @Log("导入订单") @PostMapping("/excelImport") public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) { iMpsSaleOrderService.excelImport(file,request); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java index 82b087aa..72667e59 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java @@ -2,13 +2,12 @@ package org.nl.wms.mps_manage.saleorder.service.dao; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableField; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import java.io.Serializable; +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,145 +24,198 @@ import lombok.EqualsAndHashCode; @TableName("mps_sale_order") public class MpsSaleOrder implements Serializable{ private static final long serialVersionUID = 1L; + + /** * 销售单标识 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "/**销售单标识*/") private String sale_id; /** * 销售单号 */ + @ApiModelProperty(value = "/**销售单号*/") private String sale_code; /** * 明细序号 */ - private String seq_no; - /** - * aps映射订单编码 - */ - private String aps_sale_code; - /** - * aps映射订单类型 - */ - private String aps_sale_type; - /** - * aps映射订单状态 - */ - private String aps_status; - /** - * 物料编码 - */ - private String material_code; + @ApiModelProperty(value = "/**明细序号*/") + private Integer seq_no; /** * 销售单类型 */ + @ApiModelProperty(value = "/**销售单类型*/") private String sale_type; /** * 物料标识 */ + @ApiModelProperty(value = "/**物料标识*/") private String material_id; /** * 状态 */ + @ApiModelProperty(value = "/**状态*/") private String status; - - - - /** * 销售数量 */ + @ApiModelProperty(value = "/**销售数量*/") private BigDecimal sale_qty; /** * 生产顺序 */ + @ApiModelProperty(value = "/**生产顺序*/") private Integer produce_seq; /** * 客户标识 */ + @ApiModelProperty(value = "/**客户标识*/") private String cust_id; /** * 客户编码 */ + @ApiModelProperty(value = "/**客户编码*/") private String cust_code; /** * 客户名称 */ + @ApiModelProperty(value = "/**客户名称*/") private String cust_name; /** * 计量单位标识 */ + @ApiModelProperty(value = "/**计量单位标识*/") private String qty_unit_id; - - /** - * 计量单位 + * 数量计量单位名称 */ - @TableField(exist = false) + @ApiModelProperty(value = "/**数量计量单位名称*/") private String qty_unit_name; - /** * 计划交期 */ - private String plandeliver_date; + @ApiModelProperty(value = "/**计划交期*/") + private Date plandeliver_date; /** * 创建人 */ + @ApiModelProperty(value = "/**创建人*/") private String create_id; /** * 创建人姓名 */ + @ApiModelProperty(value = "/**创建人姓名*/") private String create_name; /** * 创建时间 */ - private String create_time; + @ApiModelProperty(value = "/**创建时间*/") + @TableField(fill = FieldFill.INSERT) + private Date create_time; /** * 提交人 */ + @ApiModelProperty(value = "/**提交人*/") private String audit_id; /** * 提交时间 */ + @ApiModelProperty(value = "/**提交时间*/") private String audit_time; /** * 提交人姓名 */ + @ApiModelProperty(value = "/**提交人姓名*/") private String audit_name; /** * 确认人 */ - private Long confirm_id; + @ApiModelProperty(value = "/**确认人*/") + private String confirm_id; /** * 确认人姓名 */ + @ApiModelProperty(value = "/**确认人姓名*/") private String confirm_name; /** * 确认时间 */ + @ApiModelProperty(value = "/**确认时间*/") private String confirm_time; + /** + * 生成方式 + */ + @ApiModelProperty(value = "/**生成方式*/") + private String create_mode; /** * 是否删除 */ - private String is_delete; + @ApiModelProperty(value = "/**是否删除*/") + @TableField(fill = FieldFill.INSERT) + private Integer is_delete; /** * 备注 */ + @ApiModelProperty(value = "/**备注*/") private String remark; /** * 车间标识 */ + @ApiModelProperty(value = "/**车间标识*/") private String product_area; /** * 生产数量 */ + @ApiModelProperty(value = "/**生产数量*/") private BigDecimal product_qty; /** * 预入库数量 */ + @ApiModelProperty(value = "/**预入库数量*/") private BigDecimal instor_qty; /** * 发货数量 */ + @ApiModelProperty(value = "/**发货数量*/") private BigDecimal sendout_qty; + /** + * 物料编码 + */ + @ApiModelProperty(value = "/**物料编码*/") + private String material_code; + /** + * 物料规格 + */ + @ApiModelProperty(value = "/**物料规格*/") + private String material_spec; + /** + * 订单合同号 + */ + @ApiModelProperty(value = "/**订单合同号*/") + private String contract_code; + /** + * aps最早开始时间（下料时间) + */ + @ApiModelProperty(value = "/**aps最早开始时间（下料时间)*/") + private String early_start_time; + /** + * aps订单状态 + */ + @ApiModelProperty(value = "/**aps订单状态 */") + private String aps_status; + /** + * aps变更标识 + */ + @ApiModelProperty(value = "/**aps变更标识*/") + private String aps_update_flag; + /** + * aps变更时间 + */ + @ApiModelProperty(value = "/**aps变更时间*/") + private Date aps_update_time; + + + + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml index 537f982c..690ee974 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml @@ -5,16 +5,13 @@ SELECT - der.aps_sale_code , - SUBSTRING_INDEX(der.aps_sale_code, '-', 1) AS sale_code, - SUBSTRING_INDEX(der.aps_sale_code, '-', -1) AS seq_no, - der.aps_sale_type,der.aps_status,der.sale_type, der.material_id, der.material_code, der.product_area, - der.product_qty, der.sendout_qty, der.instor_qty,der.status, der.sale_qty, der.produce_seq, - der.cust_id, der.cust_code, der.cust_name, der.qty_unit_id, der.plandeliver_date, der.create_id, - der.create_name, der.create_time, der.audit_id, der.audit_time, der.audit_name, der.confirm_id, - der.confirm_name, der.confirm_time, der.is_delete, der.remark, - mater.material_name, - mater.material_spec, - unit.unit_name AS qty_unit_name + der.*, + DATE_FORMAT(der.plandeliver_date, '%Y-%m-%d' ) AS plandeliverDate, + DATE_FORMAT(der.create_time, '%Y-%m-%d %H:%i:%s' ) AS createTime, + DATE_FORMAT(der.aps_update_time, '%Y-%m-%d %H:%i:%s' ) AS apsUpdateTime, + mater.material_name FROM mps_sale_order der LEFT JOIN md_me_materialbase mater ON der.material_code = mater.material_code - LEFT JOIN md_pb_measureunit unit ON der.qty_unit_id = unit.measure_unit_id - der.is_delete = '0' diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java index a488eb49..9376a8d4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java @@ -112,8 +112,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl().eq("cust_code", mpsSaleOrder.getCust_code())); mpsSaleOrder.setCust_id(cust.getCust_id()); mpsSaleOrder.setCust_name(cust.getCust_name()); @@ -147,24 +146,20 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl saleCode = baseMapper.queryAll(orderQuery); - if(saleCode.stream() - .anyMatch(m -> col.equals(m.get("sale_code")))) { + if(saleCode.stream().anyMatch(m -> col.equals(m.get("sale_code")))) { continue; } 解析cell: @@ -177,67 +172,67 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl meMaterialBases = materialbaseService.list(new QueryWrapper().eq("material_code", col)); + mpsSaleOrder.setMaterial_spec(col); + List meMaterialBases = materialbaseService.list(new QueryWrapper().like("material_spec", col)); if(CollectionUtils.isEmpty(meMaterialBases)) { - errorMap.put("第" + i + "行" + col, "物料编码对应物料信息不存在"); - error_message = error_message + col + "物料编码对应物料信息不存在，"; + errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在"); + error_message = error_message + col + "物料规格对应物料信息不存在，"; } else{ - Optional first = meMaterialBases - .stream() - .findFirst(); - first.ifPresent(mdMeMaterialbase -> { + Optional first = meMaterialBases.stream().findFirst(); + first.ifPresent(mdMeMaterialbase -> + { //物料id mpsSaleOrder.setMaterial_id(mdMeMaterialbase.getMaterial_id()); + //物料编码 + mpsSaleOrder.setMaterial_code(mdMeMaterialbase.getMaterial_code()); //计量单位 mpsSaleOrder.setQty_unit_id(mdMeMaterialbase.getBase_unit_id()); }); } } - if(j == 4) { - if(StringUtils.isNotBlank(col)) { - mpsSaleOrder.setCust_id(col); + if(j == 3) { + if(StringUtils.isBlank(col)) { + throw new BadRequestException("工段信息不能为空"); } + //智能一线，智能三线 + mpsSaleOrder.setProduct_area(col.contains("三") || col.contains("3") ? "A3" : "A1"); + } + if(j == 4) { + if(StringUtils.isBlank(col)) { + throw new BadRequestException("销售数量不能为空"); + } + mpsSaleOrder.setSale_qty(BigDecimal.valueOf(Double.parseDouble(col))); } if(j == 5) { + //计量单位 if(StringUtils.isNotBlank(col)) { - mpsSaleOrder.setCust_code(col); + mpsSaleOrder.setQty_unit_name(col); } } if(j == 6) { + //最早开始时间（下料时间） if(StringUtils.isNotBlank(col)) { - mpsSaleOrder.setCust_name(col); + mpsSaleOrder.setEarly_start_time(DateUtil.format(DateUtil.parse(col), "yyyy-MM-dd")); } } if(j == 7) { - if(StringUtils.isBlank(col)) { - throw new BadRequestException("计量单位不能为空"); - } - mpsSaleOrder.setQty_unit_id(col); - } - if(j == 8) { if(StringUtils.isBlank(col)) { throw new BadRequestException("订单交期不能为空"); } - mpsSaleOrder.setPlandeliver_date(DateUtil.format(DateUtil.parse(col), "yyyy/MM/dd")); + mpsSaleOrder.setPlandeliver_date(DateUtil.parse(col)); } - if(j == 9) { + if(j == 8) { + //备注 if(StringUtils.isNotBlank(col)) { mpsSaleOrder.setRemark(col); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java index 1da1b136..1934ed23 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java @@ -40,6 +40,13 @@ public class PdmProduceWorkorder implements Serializable { */ private String workorder_code; + /** + * 工单编号 + */ + private String material_code; + + + /** * 班次类型 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index 1b92e5d7..cd377107 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -161,35 +161,39 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl ids) { - if (ids == null || ids.size() == 0) { + if(ids == null || ids.size() == 0) { return; } - List workorders = this.list(new QueryWrapper().in("workorder_id", ids).lt("workorder_status",WorkerOrderEnum.AUTO_COMPLETE.getCode())); - if (workorders.size()!= ids.size()){ + List workorders = this.list(new QueryWrapper().in("workorder_id", ids).lt("workorder_status", WorkerOrderEnum.AUTO_COMPLETE.getCode())); + if(workorders.size() != ids.size()) { throw new BadRequestException("完成的工单不允许再次下发"); } - List list = this.list(new QueryWrapper() - .nested(i -> i - .isNull("workorder_code").or() - .eq("workorder_code", "").or() - .eq("workorder_code", "0")) - .in("workorder_id", ids)); + List list = this.list(new QueryWrapper().nested(i -> i.isNull("workorder_code").or().eq("workorder_code", "").or().eq("workorder_code", "").or().eq("material_id", "0")).in("workorder_id", ids)); //aps排产完成的工单，生成工单编号再下发 if(list.size() > 0) { - list.forEach(r -> { - this.update(new UpdateWrapper() - .eq("workorder_id", r.getWorkorder_id()) - .set("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER"))); + list.forEach(r -> + { + UpdateWrapper updateWrapper = new UpdateWrapper(); + if("0".equals(r.getMaterial_id())) { + List meMaterialBases = materialbaseService.list(new QueryWrapper().eq("material_code", r.getMaterial_code())); + if(!CollectionUtils.isEmpty(meMaterialBases)) { + Optional first = meMaterialBases.stream().findFirst(); + first.ifPresent(mdMeMaterialbase -> + { + //物料id + updateWrapper.set("material_id", mdMeMaterialbase.getMaterial_id()); + //计量单位 + updateWrapper.set("materialprocess_series", mdMeMaterialbase.getProduct_series()); + }); + } + } + updateWrapper.eq("workorder_id", r.getWorkorder_id()); + updateWrapper.set("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")); + this.update(updateWrapper); }); } - this.update(new UpdateWrapper() - .set("workorder_status", WorkerOrderEnum.SEND.getCode()) - .set("down_id", SecurityUtils.getCurrentUserId()) - .set("down_name", SecurityUtils.getCurrentNickName()) - .set("down_time", new Date()) - .in("workorder_id", ids)); + this.update(new UpdateWrapper().set("workorder_status", WorkerOrderEnum.SEND.getCode()).set("down_id", SecurityUtils.getCurrentUserId()).set("down_name", SecurityUtils.getCurrentNickName()).set("down_time", new Date()).in("workorder_id", ids)); this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, ids.toArray(new String[0])); - } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/FactoryCalendarServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/FactoryCalendarServiceImpl.java index 4a8fb901..7f0ae7ee 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/FactoryCalendarServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/FactoryCalendarServiceImpl.java @@ -75,7 +75,7 @@ public class FactoryCalendarServiceImpl implements FactoryCalendarService{ whereJson.put("create_time", DateUtil.now()); WQLObject.getWQLObject("PDM_BI_FactoryCalendar").insert(whereJson); //插入明细表 - this.insertDtlTransactionally(whereJson); + this.insertDtl(whereJson); } @Override @@ -92,15 +92,16 @@ public class FactoryCalendarServiceImpl implements FactoryCalendarService{ String new_start = (old_year + 1) + "-01-01"; whereJson.put("factorycale_startdate", new_start); //插入明细表 - this.insertDtlTransactionally(whereJson); + this.insertDtl(whereJson); } - @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) - public void insertDtlTransactionally(JSONObject row) { - insertDtl(row); - } +// @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) +// public void insertDtlTransactionally(JSONObject row) { +// insertDtl(row); +// } @Async("taskExecutor") + @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) public void insertDtl(JSONObject row) { try { String a = DateUtil.format(DateUtil.parse(row.getString("factorycale_startdate")), "yyyy/MM/dd"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java index 77d3efe6..98bc8dad 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java @@ -3,7 +3,6 @@ package org.nl.wms.system_manage.service.quartz.utils; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.common.utils.ThrowableUtil; import org.nl.modules.wql.util.SpringContextHolder; @@ -17,7 +16,6 @@ import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.quartz.QuartzJobBean; import javax.annotation.Resource; diff --git a/mes/qd/src/assets/js/lodop/install_lodop32.exe b/mes/qd/src/assets/js/lodop/install_lodop32.exe index 7c52f251..6f04ce86 100644 Binary files a/mes/qd/src/assets/js/lodop/install_lodop32.exe and b/mes/qd/src/assets/js/lodop/install_lodop32.exe differ diff --git a/mes/qd/src/assets/js/lodop/install_lodop64.exe b/mes/qd/src/assets/js/lodop/install_lodop64.exe index 7e5e4a30..b0a2e4e7 100644 Binary files a/mes/qd/src/assets/js/lodop/install_lodop64.exe and b/mes/qd/src/assets/js/lodop/install_lodop64.exe differ diff --git a/mes/qd/src/views/wms/pcs/saleorder/index.vue b/mes/qd/src/views/wms/pcs/saleorder/index.vue index d7ab3889..bf2333d7 100644 --- a/mes/qd/src/views/wms/pcs/saleorder/index.vue +++ b/mes/qd/src/views/wms/pcs/saleorder/index.vue @@ -82,7 +82,7 @@ > 导入 - 同步 - + --> - - - + + + + - + - + - + - - + + + - + - + - +
@@ -205,7 +189,7 @@ min-width="100" show-overflow-tooltip /> - + - + + + + + + + - + + + + + + + + + - - - - - - - + + + + + - - + + + + + + +
- + @@ -305,8 +341,15 @@ const defaultForm = { } export default { name: 'SaleOrder', - dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT', 'product_area'], - components: { pagination, crudOperation, rrOperation, Treeselect, UploadDialog, Dialog }, + dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT', 'product_area', 'ST_CREATE_MODE'], + components: { + pagination, + crudOperation, + rrOperation, + Treeselect, + UploadDialog, + Dialog + }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ @@ -326,10 +369,8 @@ export default { }, data() { return { - unit_list: [ - {value: 16, label: '个\\只'} - ], - customer_list:[], + unit_list: [{ value: 16, label: '个\\只' }], + customer_list: [], classes3: [], uploadShow: false, dialogShow: false, @@ -344,7 +385,7 @@ export default { [CRUD.HOOK.beforeToAdd]() { customerbase.selectList().then(res => { this.customer_list = res.content - }) + }) }, queryClassId() { const param = { diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue index 555636d7..d76e80b8 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/index.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue @@ -290,13 +290,13 @@ - + @@ -360,14 +360,18 @@ - + v-model="form.is_needmove" + style="width: 200px" + > + - + v-model="form.is_canupdate_update" + style="width: 200px" + > + @@ -381,14 +385,18 @@ - + v-model="form.package_ext.unboxing_device_code" + style="width: 200px" + > + - + v-model="form.package_ext.ealing_device_code" + style="width: 200px" + > + @@ -402,8 +410,10 @@ - + v-model="form.package_ext.auto_confirm" + style="width: 200px" + > + @@ -418,21 +428,21 @@ v-model="form.package_ext.package_model" style="width: 200px;" clearable - /> + /> + /> + /> + />
@@ -465,8 +475,8 @@ > - - + + @@ -482,7 +492,7 @@ - + 3){ + if (this.form.package_ext !== undefined && this.form.package_ext !== null && JSON.stringify(this.form.package_ext).length > 3) { this.form.package_ext = JSON.parse(this.form.package_ext) } - }, [CRUD.HOOK.beforeSubmit]() { - if (JSON.stringify(this.form.package_ext).length>3){ + if (JSON.stringify(this.form.package_ext).length > 3) { this.form.package_ext = JSON.stringify(this.form.package_ext) - }else { + } else { this.form.package_ext = '' } } diff --git a/wcs/nladmin-ui/src/assets/js/lodop/install_lodop32.exe b/wcs/nladmin-ui/src/assets/js/lodop/install_lodop32.exe index 7c52f251..a6da35e2 100644 Binary files a/wcs/nladmin-ui/src/assets/js/lodop/install_lodop32.exe and b/wcs/nladmin-ui/src/assets/js/lodop/install_lodop32.exe differ diff --git a/wcs/nladmin-ui/src/assets/js/lodop/install_lodop64.exe b/wcs/nladmin-ui/src/assets/js/lodop/install_lodop64.exe index 7e5e4a30..19985e43 100644 Binary files a/wcs/nladmin-ui/src/assets/js/lodop/install_lodop64.exe and b/wcs/nladmin-ui/src/assets/js/lodop/install_lodop64.exe differ