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 ab4f87dd..a13d392b 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 @@ -137,6 +137,15 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ return dto; } + public MaterialbaseDto findById(String material_id) { + MdMeMaterialbase materialbase = materialbaseService.getOne(new QueryWrapper().eq("material_id", material_id)); + MdPbMeasureunit unit = mdPbMeasureunitService.getOne(new QueryWrapper().eq("measure_unit_id", materialbase.getBase_unit_id())); + MaterialbaseDto dto = new MaterialbaseDto(); + BeanUtils.copyProperties(materialbase, dto); + dto.setBase_unit_name(unit.getUnit_name()); + return dto; + } + @Override public MaterialbaseDto findByCode(String code) { if(StrUtil.isNotEmpty(code) && code.contains("\\")) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java index 3c83c24f..3a35659b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java @@ -91,7 +91,8 @@ public class PcsIfPurchaseorderController{ @PostMapping("/update") @Log("修改原料计划") //("修改原料需求") - public ResponseEntity update(@RequestBody JSONObject whereJson) { + public ResponseEntity update(@RequestBody JSONObject whereJson) + throws ParseException { purchaseorderService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java index f26f60d7..75f0543a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java @@ -57,5 +57,6 @@ public interface IPcsIfPurchaseorderService extends IService /** * 原料需求单修改 */ - void update(JSONObject form); + void update(JSONObject form) + throws ParseException; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java index 30c80cd0..9ef1ea41 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; @@ -178,4 +179,10 @@ public class PcsIfPurchaseorder implements Serializable{ * 对应半成品物料规格 */ private String semireal_spec; + + /** + * aps到货时间 + */ + private Date aps_instorage_time; + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java index 3ec9b276..95b1285b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import lombok.Data; import org.apache.poi.hpsf.Decimal; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -192,6 +193,8 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl implements IStIvtIostorinvdisYlService { +public class StIvtIostorinvdisYlServiceImpl extends ServiceImpl implements IStIvtIostorinvdisYlService{ + @Autowired + private IStIvtSectattrService sectattrService; + @Autowired + private IStIvtStructattrService structattrService; + @Resource + private MaterialbaseServiceImpl materialbaseService; - @Autowired - private IStIvtSectattrService sectattrService; - @Autowired - private IStIvtStructattrService structattrService; + @Override + public void create(JSONObject jo, JSONObject mst_jo) { + if(ObjectUtil.isNotEmpty(mst_jo)) { + String mst_id = mst_jo.getString("mst_id"); + String dtl_id = mst_jo.getString("dtl_id"); + String iostorinvdisYl_id = IdUtil.getStringId(); + StIvtIostorinvdisYl row = jo.toJavaObject(StIvtIostorinvdisYl.class); + row.setIostorinv_id(mst_id); + row.setIostorinvdtl_id(dtl_id); + row.setIostorinvdtl_id(dtl_id); + row.setIostorinvdis_id(iostorinvdisYl_id); + List list = this.list(new QueryWrapper().eq("iostorinvdtl_id", dtl_id)); + row.setSeq_no(list.size() + 1); + row.setIs_active(true); + row.setWork_status(IOSEnum.WORK_STATUS.code("未生成")); + row.setPlan_qty(row.getPlan_qty()); + // 获取库区信息 + QueryWrapper sect_wrapper = new QueryWrapper<>(); + sect_wrapper.eq("sect_id", row.getSect_id()); + sect_wrapper.eq("is_used", true); + StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper); + if(ObjectUtil.isEmpty(sectDao)) { + throw new BadRequestException("库区不存在或未启用！"); + } + row.setSect_code(sectDao.getSect_code()); + row.setSect_name(sectDao.getSect_name()); + // 获取仓位信息 + QueryWrapper struct_wrapper = new QueryWrapper<>(); + struct_wrapper.eq("struct_id", row.getStruct_id()); + struct_wrapper.eq("is_used", true); + StIvtStructattr structDao = structattrService.getOne(struct_wrapper); + if(ObjectUtil.isEmpty(structDao)) { + throw new BadRequestException("仓位不存在或未启用！"); + } + //查询物料信息 + MaterialbaseDto materialbaseDto = materialbaseService.findById(row.getMaterial_id()); + if(ObjectUtil.isEmpty(materialbaseDto)) { + throw new BadRequestException("物料信息不存在！"); + } + row.setMaterial_code(materialbaseDto.getMaterial_code()); + row.setStruct_code(structDao.getStruct_code()); + row.setStruct_name(structDao.getStruct_name()); + row.setPcsn(DateUtil.today()); + this.save(row); + } + } - @Override - public void create(JSONObject jo, JSONObject mst_jo) { - if (ObjectUtil.isNotEmpty(mst_jo)) { - - String mst_id = mst_jo.getString("mst_id"); - String dtl_id = mst_jo.getString("dtl_id"); - String iostorinvdisYl_id = IdUtil.getStringId(); - StIvtIostorinvdisYl row = jo.toJavaObject(StIvtIostorinvdisYl.class); - row.setIostorinv_id(mst_id); - row.setIostorinvdtl_id(dtl_id); - row.setIostorinvdtl_id(dtl_id); - row.setIostorinvdis_id(iostorinvdisYl_id); - List list = this.list(new QueryWrapper().eq("iostorinvdtl_id", dtl_id)); - row.setSeq_no(list.size() + 1); - row.setIs_active(true); - row.setWork_status(IOSEnum.WORK_STATUS.code("未生成")); - row.setPlan_qty(row.getPlan_qty()); - - // 获取库区信息 - QueryWrapper sect_wrapper = new QueryWrapper<>(); - sect_wrapper.eq("sect_id", row.getSect_id()); - sect_wrapper.eq("is_used", true); - StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper); - if (ObjectUtil.isEmpty(sectDao)) throw new BadRequestException("库区不存在或未启用！"); - - row.setSect_code(sectDao.getSect_code()); - row.setSect_name(sectDao.getSect_name()); - // 获取仓位信息 - QueryWrapper struct_wrapper = new QueryWrapper<>(); - struct_wrapper.eq("struct_id", row.getStruct_id()); - struct_wrapper.eq("is_used", true); - StIvtStructattr structDao = structattrService.getOne(struct_wrapper); - if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！"); - - row.setStruct_code(structDao.getStruct_code()); - row.setStruct_name(structDao.getStruct_name()); - - - - row.setPcsn(DateUtil.today()); - this.save(row); - } - } - - @Override - public void deleteById(String mst_id) { - this.remove(new QueryWrapper().eq("iostorinv_id", mst_id)); - } + @Override + public void deleteById(String mst_id) { + this.remove(new QueryWrapper().eq("iostorinv_id", mst_id)); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtYl.java index 4b99b199..ecd93d23 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtYl.java @@ -113,5 +113,18 @@ public class StIvtStructivtYl implements Serializable { */ private String workshop_id; + /** + * 物料编号 + */ + private String material_code; + /** + * aps入库时间 + */ + private String aps_instorage_time; + /** + * aps订单种类 + */ + private String aps_sale_type; + }