r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优生产制单备注

This commit is contained in:
wwb 2025-01-04 17:10:28 +08:00
parent 86a118a785
commit a2ea5282a2
6 changed files with 70 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderRespVO.java
View File

@ -107,4 +107,6 @@ public class ProduceOrderRespVO {
@Schema(description = "详情")
private String details;
@Schema(description = "备注")
private String remarks;
}

2
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoRespVO.java
View File

@ -53,7 +53,7 @@ public class ProductInfoRespVO {
@Schema(description = "备注")
@ExcelProperty("备注")
private String remark;
private String remarks;
@Schema(description = "品牌名称")
@ExcelProperty("品牌名称")

6
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java
View File

@ -138,6 +138,12 @@ public class SaleOrderDO extends BaseDO {
* 合同编码
*/
private String contractCode;
/**
* 销售合约编码
*/
private String saleContractCode;
/**
* 零售商单号
*/

17
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
View File

@ -352,7 +352,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
Long userId = SecurityFrameworkUtils.getLoginUserId();
saleOrder.setAuditor(userId.toString());
saleOrder.setAuditorTime(LocalDateTime.now());
saleOrderMapper.updateById(saleOrder);
//生成产品单价记录
@ -363,7 +363,10 @@ public class SaleOrderServiceImpl implements SaleOrderService {
}
//生成销售合约
Long saleContractId = generateSaleContract(saleOrder, entrys);
SaleContractSaveReqVO saleContractVO = generateSaleContract(saleOrder, entrys);
Long saleContractId = saleContractVO.getId();
saleOrder.setSaleContractCode(saleContractVO.getBillno());
saleOrderMapper.updateById(saleOrder);
String htmlContent = generateHtmlContent(saleContractId);
@ -452,7 +455,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
ProductInfoDO productInfo = productInfoService.getProductInfo(entry.getMaterialId());
ProduceOrderSaveReqVO saveReqVO = new ProduceOrderSaveReqVO();
saveReqVO.setOrderNo(saleOrder.getBillno());
saveReqVO.setSaleContractNo(saleOrder.getContractCode());
saveReqVO.setSaleContractNo(saleOrder.getSaleContractCode());
saveReqVO.setCustomerId(customer.getId());
saveReqVO.setCustomerCode(customer.getNumber());
saveReqVO.setProductId(entry.getMaterialId());
@ -995,9 +998,11 @@ public class SaleOrderServiceImpl implements SaleOrderService {
}
private Long generateSaleContract(SaleOrderDO saleOrder, List<SaleOrderEntryDO> entrys) {
private SaleContractSaveReqVO generateSaleContract(SaleOrderDO saleOrder, List<SaleOrderEntryDO> entrys) {
SaleContractSaveReqVO saveReqVO = toSaleContractVO(saleOrder, entrys);
return saleContractService.createSaleContract(saveReqVO);
Long id = saleContractService.createSaleContract(saveReqVO);
saveReqVO.setId(id);
return saveReqVO;
}
@ -1018,7 +1023,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
saveReqVO.setBillno(billno);
saveReqVO.setCustomerId(saleOrder.getCustomerId());
saveReqVO.setCustomerName(customer.getName());
saveReqVO.setCustomerBuyNo(saleOrder.getBillno());
saveReqVO.setCustomerBuyNo(saleOrder.getContractCode());
saveReqVO.setBizdate(saleOrder.getBizdate());
saveReqVO.setPartyA(customer.getCompany());
saveReqVO.setHead(customer.getGdperson());

1
hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
View File

@ -215,6 +215,7 @@ const formData = ref({
deliverydateStr: undefined,
deliveryQty: undefined,
details: undefined,
remarks: undefined,
})
const formRules = reactive({

78
hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js
View File

@ -594,14 +594,14 @@ export default {
},
{
"options": {
"left": 60,
"top": 262.5,
"left": 61.5,
"top": 259.5,
"height": 178.5,
"width": 532,
"right": 587.5,
"bottom": 453.7449760437012,
"vCenter": 321.5,
"hCenter": 358.4949760437012,
"right": 593.4955368041992,
"bottom": 440.98885345458984,
"vCenter": 327.4955368041992,
"hCenter": 351.73885345458984,
"field": "details",
"coordinateSync": false,
"widthHeightSync": false,
@ -612,29 +612,6 @@ export default {
"type": "longText"
}
},
{
"options": {
"left": 15,
"top": 444,
"height": 50,
"width": 575,
"title": "备注",
"right": 583.5,
"bottom": 487.4950575828552,
"vCenter": 300.75,
"hCenter": 464.9950575828552,
"coordinateSync": false,
"widthHeightSync": false,
"qrCodeLevel": 0,
"field": "remarks",
"fontSize": 9,
"fontWeight": "700"
},
"printElementType": {
"title": "文本",
"type": "text"
}
},
{
"options": {
"left": 15,
@ -2227,6 +2204,49 @@ export default {
"title": "横线",
"type": "hline"
}
},
{
"options": {
"left": 15,
"top": 441,
"height": 9.75,
"width": 39,
"title": "备注：",
"right": 136.49553680419922,
"bottom": 444.7500228881836,
"vCenter": 76.49553680419922,
"hCenter": 439.8750228881836,
"coordinateSync": false,
"widthHeightSync": false,
"fontSize": 9,
"fontWeight": "700",
"qrCodeLevel": 0
},
"printElementType": {
"title": "文本",
"type": "text"
}
},
{
"options": {
"left": 42,
"top": 441,
"height": 61.5,
"width": 550.5,
"right": 592.4977569580078,
"bottom": 502.4933338165283,
"vCenter": 317.2477569580078,
"hCenter": 471.7433338165283,
"field": "remarks",
"coordinateSync": false,
"widthHeightSync": false,
"fixed": true,
"qid": "details_1"
},
"printElementType": {
"title": "",
"type": "longText"
}
}
],
"paperNumberLeft": 565,