yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【本地调试配置】订单明细

Browse Source
dev
siontion 2 months ago
parent 7c4d1b79a5
commit b0faa26004
5 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File

2
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java
Unescape View File

@ -279,7 +279,7 @@ public class ChanjetController {
//测试
// chanjetManager.createProductionOrder(232L);
chanjetManager.createProductionOrder(232L);
// sendProcedureReport2TPlus();
// chanjetSchedule.createStorageOut();
// chanjetSchedule.createStorageInOrder();

2
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetInterfaceEnum.java
Unescape View File

@ -31,6 +31,8 @@ public enum ChanjetInterfaceEnum {
CREATE_STOCK_OUT_ORDER("/tplus/api/v2/materialDispatch/Create", "创建出库单", CreateStockOutOrderReqVO.class, ResultResVO.class),
CREATE_PRODUCTION_ORDER("/tplus/api/v2/ManufactureOrderOpenApi/Create", "创建生产加工单", CreateProductionOrderReqVO.class, ResultResVO.class),
CREATE_PRODUCTION_ORDER_ASYNC("/tplus/api/v2/ManufactureOrderOpenApi/CreateAsync", "异步创建生产加工单", CreateProductionOrderReqVO.class, ResultResVO.class),
UPDATE_PRODUCTION_ORDER("/tplus/api/v2/ManufactureOrderOpenApi/Update", "修改生产加工单", CreateProductionOrderReqVO.class, ResultResVO.class),
DELETE_PRODUCTION_ORDER("/tplus/api/v2/ManufactureOrderOpenApi/Delete", "删除生产加工单", CreateProductionOrderReqVO.class, ResultResVO.class),
AUDIT_PRODUCTION_ORDER("/tplus/api/v2/ManufactureOrderOpenApi/Audit", "审核生产加工单", AuditProductionOrderReqVO.class, ResultResVO.class),

32
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderSubDO.java
Unescape View File

@ -71,6 +71,23 @@ public class ProjectOrderSubDO extends BaseDO {
private String productionDetailId;
private Integer orderAmount;
/**
* 客户分订单号
*/
private String customerSubCode;
/**
* 订单序号
*/
private String orderSerialNumber;
/**
* 颜色
*/
private String freeItemColor;
/**
* 单位
*/
@ -190,21 +207,6 @@ public class ProjectOrderSubDO extends BaseDO {
@TableField(exist = false)
private BigDecimal availableQuantity;
private Integer orderAmount;
/**
* 客户分订单号
*/
private String pubuserdefnvc2;
/**
* 订单序号
*/
private String priuserdefnvc2;
/**
* 颜色
*/
private String freeItem0;
}

67
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java
Unescape View File

@ -986,9 +986,9 @@ public class ChanjetManager {
subDO.setAmount(mList.stream().mapToInt(QuerySaleOrderListResDTO::getAmount).sum());
subDO.setOrderAmount(mList.stream().mapToInt(QuerySaleOrderListResDTO::getAmount).sum());
subDO.setPubuserdefnvc2(mList.get(0).getPubuserdefnvc2());
subDO.setPriuserdefnvc2(mList.get(0).getPriuserdefnvc2());
subDO.setFreeItem0(mList.get(0).getFreeItem0());
subDO.setCustomerSubCode(mList.get(0).getPubuserdefnvc2());
subDO.setOrderSerialNumber(mList.get(0).getPriuserdefnvc2());
subDO.setFreeItemColor(mList.get(0).getFreeItem0());
subDOList.add(subDO);
});
@ -1455,47 +1455,46 @@ public class ChanjetManager {
.setManufactureOrderDetails(detailList);
// 设置生产加工单工序信息
List<ManufactureOrderProcessDetails> manufactureOrderProcessDetailsList = new ArrayList<>();
ManufactureOrderProcessDetails manufactureOrderProcessDetails = new ManufactureOrderProcessDetails();
manufactureOrderProcessDetails.setInventory(new Inventory(subDOList.get(0).getProjectSubCode()));
ProcessingType processingType = new ProcessingType();
processingType.setCode("HomeMade");
manufactureOrderProcessDetails.setProcessingType(processingType);
manufactureOrderProcessDetails.setUnit(new Unit(subDOList.get(0).getUnit()));
// 生产订单必须要选择工序，否则无法与工序汇报单无法匹配
manufactureOrderProcessDetails.setProcess(new Process("01"));
manufactureOrderProcessDetailsList.add(manufactureOrderProcessDetails);
// // 设置生产加工单工序信息
// List<ManufactureOrderProcessDetails> manufactureOrderProcessDetailsList = new ArrayList<>();
// ManufactureOrderProcessDetails manufactureOrderProcessDetails = new ManufactureOrderProcessDetails();
// manufactureOrderProcessDetails.setInventory(new Inventory(subDOList.get(0).getProjectSubCode()));
// ProcessingType processingType = new ProcessingType();
// processingType.setCode("HomeMade");
// manufactureOrderProcessDetails.setProcessingType(processingType);
// manufactureOrderProcessDetails.setUnit(new Unit(subDOList.get(0).getUnit()));
// // 生产订单必须要选择工序，否则无法与工序汇报单无法匹配
// manufactureOrderProcessDetails.setProcess(new Process("01"));
//
// manufactureOrderProcessDetailsList.add(manufactureOrderProcessDetails);
//
// ManufactureOrderDetails detail = new ManufactureOrderDetails();
// DictDataDO dictDataDO = dictDataMapper.selectByDictTypeAndValue(DictTypeConstants.MATERIAL_UNIT.getCode(), subDOList.get(0).getUnit());
//
// detail.setInventory(new Inventory(subDOList.get(0).getProjectSubCode()))
// .setUnit(new Unit(dictDataDO.getLabel()))
// .setQuantity(subDOList.get(0).getAmount())
// .setPreStartDate(aDo.getProjectStartTime().format(DateTimeFormatter.ISO_DATE))
// .setPreFinishDate(aDo.getProjectEndTime().format(DateTimeFormatter.ISO_DATE))
// .setManufactureOrderProcessDetails(manufactureOrderProcessDetailsList)
// ;
// detailList.add(detail);
subDOList.forEach(subDO -> {
ManufactureOrderDetails detail = new ManufactureOrderDetails();
DictDataDO dictDataDO = dictDataMapper.selectByDictTypeAndValue(DictTypeConstants.MATERIAL_UNIT.getCode(), subDOList.get(0).getUnit());
DictDataDO dictDataDO = dictDataMapper.selectByDictTypeAndValue(DictTypeConstants.MATERIAL_UNIT.getCode(), subDO.getUnit());
detail.setInventory(new Inventory(subDOList.get(0).getProjectSubCode()))
detail.setInventory(new Inventory(subDO.getProjectSubCode()))
.setUnit(new Unit(dictDataDO.getLabel()))
.setQuantity(subDOList.get(0).getAmount())
.setQuantity(subDO.getAmount())
.setPreStartDate(aDo.getProjectStartTime().format(DateTimeFormatter.ISO_DATE))
.setPreFinishDate(aDo.getProjectEndTime().format(DateTimeFormatter.ISO_DATE))
.setManufactureOrderProcessDetails(manufactureOrderProcessDetailsList)
;
detailList.add(detail);
// subDOList.forEach(subDO -> {
// ManufactureOrderDetails detail = new ManufactureOrderDetails();
// DictDataDO dictDataDO = dictDataMapper.selectByDictTypeAndValue(DictTypeConstants.MATERIAL_UNIT.getCode(), subDO.getUnit());
//
// detail.setInventory(new Inventory(subDO.getProjectSubCode()))
// .setUnit(new Unit(dictDataDO.getLabel()))
// .setQuantity(subDO.getAmount())
// .setPreStartDate(aDo.getProjectStartTime().format(DateTimeFormatter.ISO_DATE))
// .setPreFinishDate(aDo.getProjectEndTime().format(DateTimeFormatter.ISO_DATE))
// ;
// detailList.add(detail);
// });
});
// 设置为“是”，打开所有与用友通信的接口
if(getSystemParameters()) {
//判断是否已经提交过生产加工单
CommonResult<ListResultResVO> resultExist =
chanjetSpi.invoke(QUERY_PRODUCTION_ORDER_LIST, new ListProductionOrderReqVO(aDo.getCode()), ListResultResVO.class);
@ -1506,7 +1505,7 @@ public class ChanjetManager {
CommonResult<ResultResVO> result = null;
if(resultExist.getData().getData()!=null && resultExist.getData().getData().getTotalCount()==0){
//没提交过，直接创建生产加工单
result = chanjetSpi.invoke(CREATE_PRODUCTION_ORDER, new CreateProductionOrderReqVO(dto), ResultResVO.class);
result = chanjetSpi.invoke(CREATE_PRODUCTION_ORDER_ASYNC, new CreateProductionOrderReqVO(dto), ResultResVO.class);
}else{
//生产加工单修改接口问题，重新提交时要先弃审，删除，再重新创建，

6
sql/v1.0.0/2.business/1.structure.sql
Unescape View File

@ -674,7 +674,7 @@ alter table wms_storage_check_mat Modify COLUMN pn_id bigint(20) default null CO
alter table project_sale_order ADD COLUMN ts varchar(32) default null COMMENT '用友时间戳';
ALTER TABLE pro_task_report ADD COLUMN `has_synch_storage` TINYINT(1) DEFAULT null COMMENT '入库同步标识';
alter table project_sale_order_sub ADD COLUMN pubuserdefnvc2 varchar(64) default null COMMENT '客户分订单号';
alter table project_sale_order_sub ADD COLUMN priuserdefnvc2 varchar(64) default null COMMENT '订单序列号';
alter table project_sale_order_sub ADD COLUMN freeItem0 varchar(64) default null COMMENT '颜色';
alter table project_sale_order_sub ADD COLUMN customer_sub_code varchar(64) default null COMMENT '客户分订单号';
alter table project_sale_order_sub ADD COLUMN order_serial_number varchar(64) default null COMMENT '订单序列号';
alter table project_sale_order_sub ADD COLUMN free_item_color varchar(64) default null COMMENT '颜色';

Write Preview
Loading…
Cancel
Save