root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:aps原料需求和采购订单功能修改

Browse Source
This commit is contained in:
baoge
2023-09-22 13:55:06 +08:00
parent e5f4aaff35
commit d55e063092
12 changed files with 126 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java
View File

@@ -37,6 +37,12 @@ public class BaseQuery<T> {
private String start_time;
private String end_time;
/**
* 计划时间范围查询
*/
private String plan_start_time;
private String plan_end_time;
/**
* 字段映射Map:指定字段对应QueryWrapper的查询类型
@@ -47,6 +53,8 @@ public class BaseQuery<T> {
public Map<String, QParam> doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build()
,"start_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LT).build()
,"end_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LE).build()
,"plan_start_time", QParam.builder().k(new String[]{"plandeliver_date"}).type(QueryTEnum.LE).build()
,"plan_end_time", QParam.builder().k(new String[]{"plandeliver_date"}).type(QueryTEnum.LE).build()
,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build()
);

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
View File

@@ -24,6 +24,9 @@
<if test="query.sale_type != null">
and der.sale_type >= #{query.sale_type}
</if>
<if test="query.create_mode != null">
and der.create_mode >= #{query.create_mode}
</if>
<if test="query.cust_code != null">
and der.cust_code >= #{query.cust_code}
</if>
@@ -33,6 +36,12 @@
<if test="query.end_time != null and query.end_time != ''">
and #{query.end_time} >= der.create_time
</if>
<if test="query.plan_start_time != null and query.plan_start_time != ''">
and der.plandeliver_date >= #{query.plan_start_time}
</if>
<if test="query.plan_end_time != null and query.plan_end_time != ''">
and #{query.plan_end_time} >= der.plandeliver_date
</if>
</where>
order by der.sale_code,seq_no
</select>

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dto/OrderQuery.java
View File

@@ -20,6 +20,8 @@ public class OrderQuery extends BaseQuery<MpsSaleOrder> {
private String sale_type;
private String create_mode;
private String material_code;
private String cust_code;

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java
View File

@@ -240,7 +240,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
}
List<MdMeMaterialbase> meMaterialBases = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
if(CollectionUtils.isEmpty(meMaterialBases)) {
errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
break;
}
else{
Optional<MdMeMaterialbase> first = meMaterialBases.stream().filter(r -> r.getMaterial_code().contains("S") && !r.getMaterial_name().contains("TH")).findFirst();
@@ -256,9 +256,6 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
// 计量单位
mpsSaleOrder.setQty_unit_id(first.get().getBase_unit_id());
}
else{
errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
}
}
}
if(j == 3) {

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfDemandorder.java
View File

@@ -170,4 +170,8 @@ public class PcsIfDemandorder implements Serializable{
* 对应半成品物料规格
*/
private String semireal_spec;
/**
* 对应半成品物料规格
*/
private String material_name;
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java
View File

@@ -179,10 +179,12 @@ public class PcsIfPurchaseorder implements Serializable{
* 对应半成品物料规格
*/
private String semireal_spec;
/**
* aps到货时间
*/
private Date aps_instorage_time;
/**
* 对应半成品物料规格
*/
private String material_name;
}

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfDemandorderServiceImpl.java
View File

@@ -117,6 +117,7 @@ public class PcsIfDemandorderServiceImpl extends ServiceImpl<PcsIfDemandorderMap
order.setCreate_mode(CHECKEnum.CREATE_MODE.code("PC产生"));
order.setCreate_id(SecurityUtils.getCurrentUserId());
order.setSemireal_code(form.getString("semireal_code"));
order.setMaterial_name(row.getString("material_name"));
order.setCreate_name(SecurityUtils.getCurrentNickName());
order.setCreate_time(DateUtil.format(new Date(), "yyyy/MM/dd HH:mm:ss"));
order.setIs_delete(false);

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java
View File

@@ -171,5 +171,9 @@ public class StIvtIostorinvdisYl implements Serializable {
*/
private String point_name;
/**
* 物料名称
*/
private String material_name;
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java
View File

@@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -191,7 +192,8 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl<StIvtIostorinvYlMap
.stor_id(mst.getStor_id())
.workshop_id(mst.getWorkshop_id())
.material_code(dis.getMaterial_code())
.aps_instorage_time(DateUtil.now())
.material_name(dis.getMaterial_name())
.aps_instorage_time(new Date())
.aps_sale_type("I")//对应aps订单种类为绝对库存
.build();
structivtYlService.save(ivtDao);

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java
View File

@@ -83,6 +83,7 @@ public class StIvtIostorinvdisYlServiceImpl extends ServiceImpl<StIvtIostorinvdi
throw new BadRequestException("物料信息不存在！");
}
row.setMaterial_code(materialbaseDto.getMaterial_code());
row.setMaterial_name(materialbaseDto.getMaterial_name());
row.setStruct_code(structDao.getStruct_code());
row.setStruct_name(structDao.getStruct_name());
row.setPcsn(DateUtil.today());

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtYl.java
View File

@@ -120,11 +120,16 @@ public class StIvtStructivtYl implements Serializable {
/**
* aps入库时间
*/
private String aps_instorage_time;
private Date aps_instorage_time;
/**
* aps订单种类
*/
private String aps_sale_type;
/**
* 物料名称
*/
private String material_name;
}