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

Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev 

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
yf 2025-01-19 18:17:31 +08:00
parent 2ec371bd9a a14f49f94d
commit f1f88ae4dc
8 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,4 +82,8 @@ public class ProduceOrderImportExcelVO {
@ExcelProperty("交货数量")
private Long deliveryQty;
@Schema(description = "备注")
@ExcelProperty("备注")
private Long remarks2;
}

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

@ -109,4 +109,7 @@ public class ProduceOrderRespVO {
@Schema(description = "备注")
private String remarks;
@Schema(description = "备注")
private String remarks2;
}

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

@ -86,4 +86,7 @@ public class ProduceOrderSaveReqVO {
@Schema(description = "备注")
private String remarks;
@Schema(description = "备注2")
private String remarks2;
}

5
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java
View File

@ -126,4 +126,9 @@ public class ProduceOrderDO extends BaseDO {
*/
private String remarks;
/**
* 备注2
*/
private String remarks2;
}

4
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
View File

@ -83,9 +83,9 @@ public class ProduceOrderServiceImpl implements ProduceOrderService {
String specMaterial = productInfo.getSpecMaterial();
String productionInfo = productInfo.getProductionInfo();
StringBuffer str = new StringBuffer();
/* str.append(String.format("货名：%s\r\n",productInfo.getName()));
str.append(String.format("货名：%s\r\n",productInfo.getName()));
str.append(String.format("规格：%s × %s \r\n",specSizeWidth,specSizeHeight));
str.append(String.format("纸质：%s \r\n",specMaterial));*/;
str.append(String.format("纸质：%s \r\n",specMaterial));;
str.append(String.format("%s ",productionInfo));
updateObj.setDetails(str.toString());

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

@ -473,8 +473,12 @@ public class SaleOrderServiceImpl implements SaleOrderService {
saveReqVO.setProduceDate(LocalDateTime.now());
saveReqVO.setInspectionDate(LocalDateTime.now());
saveReqVO.setDeliverydate(LocalDateTime.now());
if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0){
saveReqVO.setRemarks(saleOrderSkuDO.get(0).getRemark());
if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0 && 7l == productInfo.getProductTypeId()){
String remarks = "";
for (SaleOrderSkuDO orderSkuDO : saleOrderSkuDO) {
remarks = remarks += orderSkuDO.getLabelSize() + " " + orderSkuDO.getOrderQty()+"; ";
}
saveReqVO.setRemarks(remarks);
}
Double specSizeWidth = productInfo.getSpecSizeWidth();
Double specSizeHeight = productInfo.getSpecSizeHeight();
@ -1013,7 +1017,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
String billno = getNewOrderCode2();
String contractType = saleOrder.getContractType();
if (StringUtils.isNotBlank(contractType)) {
billno = billno.replace("XXXX-", contractType + "-");
billno = billno.replace("XXXX", contractType);
}
/* // 优先使用销售订单合同号
String billno = saleOrder.getContractCode();

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

@ -156,6 +156,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remarks2">
<el-input v-model="formData.remarks2" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button @click="downpdf" type="primary" v-if="formData.id" :disabled="formLoading">下 载</el-button>
@ -216,6 +223,8 @@ const formData = ref({
deliveryQty: undefined,
details: undefined,
remarks: undefined,
remarks2: undefined,
remarksText: undefined,
})
const formRules = reactive({
@ -298,11 +307,15 @@ const resetForm = () => {
inspectionDate: undefined,
deliverydate: undefined,
deliveryQty: undefined,
details: undefined,
remarks: undefined,
remarks2: undefined,
remarksText: undefined,
}
formRef.value?.resetFields()
}
// 下载
const downpdf = async () => {
const id = formData.value.id;
if (id) {
@ -316,8 +329,14 @@ const downpdf = async () => {
formData.value.produceDateStr = formatDate(formData.value.produceDate,'YYYY-MM-DD')
formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
const remarks = formData.value.remarks
const remarks2 = formData.value.remarks2 || ''
if(remarks){
formData.value.remarksText = remarks + '\n \n' +remarks2
}else {
formData.value.remarksText = remarks2
}
//formData.value.saleContractNo = formData.value.orderNo
if(formData.value.productId){
const material = await ProductInfoApi.getProductInfo(formData.value.productId)
formData.value.productCode = material.code
@ -345,6 +364,7 @@ const downpdf = async () => {
}
// 预览
const preview = async () => {
const id = formData.value.id;
if (id) {
@ -357,6 +377,13 @@ const preview = async () => {
formData.value.produceDateStr = formatDate(formData.value.produceDate,'YYYY-MM-DD')
formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
const remarks = formData.value.remarks
const remarks2 = formData.value.remarks2 || ''
if(remarks){
formData.value.remarksText = remarks + '\n \n' +remarks2
}else {
formData.value.remarksText = remarks2
}
//formData.value.saleContractNo = formData.value.orderNo
if(formData.value.productId){

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

@ -2237,7 +2237,7 @@ export default {
"bottom": 502.4933338165283,
"vCenter": 317.2477569580078,
"hCenter": 471.7433338165283,
"field": "remarks",
"field": "remarksText",
"coordinateSync": false,
"widthHeightSync": false,
"fixed": true,