diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderImportExcelVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderImportExcelVO.java
index 057fa29..54eb4a4 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderImportExcelVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderImportExcelVO.java
@@ -82,4 +82,8 @@ public class ProduceOrderImportExcelVO {
@ExcelProperty("交货数量")
private Long deliveryQty;
+ @Schema(description = "备注")
+ @ExcelProperty("备注")
+ private Long remarks2;
+
}
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderRespVO.java
index 739d60e..c7be0e8 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderRespVO.java
@@ -109,4 +109,7 @@ public class ProduceOrderRespVO {
@Schema(description = "备注")
private String remarks;
+
+ @Schema(description = "备注")
+ private String remarks2;
}
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java
index 0f8dc24..cdbe85d 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java
@@ -86,4 +86,7 @@ public class ProduceOrderSaveReqVO {
@Schema(description = "备注")
private String remarks;
+ @Schema(description = "备注2")
+ private String remarks2;
+
}
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java
index c421786..48f1fe1 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java
@@ -126,4 +126,9 @@ public class ProduceOrderDO extends BaseDO {
*/
private String remarks;
+ /**
+ * 备注2
+ */
+ private String remarks2;
+
}
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
index 0d42b12..8b8a440 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
@@ -82,12 +82,12 @@ public class ProduceOrderServiceImpl implements ProduceOrderService {
Double specSizeHeight = productInfo.getSpecSizeHeight();
String specMaterial = productInfo.getSpecMaterial();
String productionInfo = productInfo.getProductionInfo();
-/* StringBuffer str = new StringBuffer();
+ StringBuffer str = new StringBuffer();
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 ",productionInfo));
- //updateObj.setDetails(str.toString());
+ str.append(String.format("纸质:%s \r\n",specMaterial));;
+ str.append(String.format("%s ",productionInfo));
+ updateObj.setDetails(str.toString());
produceOrderMapper.updateById(updateObj);
}
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
index 9567c54..63f23b5 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
@@ -480,14 +480,14 @@ public class SaleOrderServiceImpl implements SaleOrderService {
}
saveReqVO.setRemarks(remarks);
}
- /* Double specSizeWidth = productInfo.getSpecSizeWidth();
+ Double specSizeWidth = productInfo.getSpecSizeWidth();
Double specSizeHeight = productInfo.getSpecSizeHeight();
String specMaterial = productInfo.getSpecMaterial();
StringBuffer str = new StringBuffer();
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));
- saveReqVO.setDetails(str.toString());*/
+ saveReqVO.setDetails(str.toString());
Long produceOrderId = produceOrderService.createProduceOrder(saveReqVO);
}
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Search/src/Search.vue b/hangtag-ui/hangtag-ui-admin/src/components/Search/src/Search.vue
index 3218a63..c1d0737 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/Search/src/Search.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/Search/src/Search.vue
@@ -97,6 +97,10 @@ const setVisible = () => {
unref(elFormRef)?.resetFields()
visible.value = !unref(visible)
}
+defineExpose({
+ reset,
+ search
+})
@@ -131,8 +135,8 @@ const setVisible = () => {
-
-
+
+
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
index f721ec2..f45b09a 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
@@ -158,8 +158,8 @@
-
-
+
+
@@ -223,6 +223,7 @@ const formData = ref({
deliveryQty: undefined,
details: undefined,
remarks: undefined,
+ remarks2: undefined,
remarksText: undefined,
})
@@ -308,6 +309,7 @@ const resetForm = () => {
deliveryQty: undefined,
details: undefined,
remarks: undefined,
+ remarks2: undefined,
remarksText: undefined,
}
formRef.value?.resetFields()
@@ -328,23 +330,22 @@ const downpdf = async () => {
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 details = formData.value.details || ''
+ const remarks2 = formData.value.remarks2 || ''
if(remarks){
- formData.value.remarksText = remarks + '\n' +details
+ formData.value.remarksText = remarks + '\n \n' +remarks2
}else {
- formData.value.remarksText = details
+ 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
formData.value.productName = material.name
- //formData.value.details = material.productionInfo
+ formData.value.details = material.productionInfo
}else {
formData.value.productCode = ''
formData.value.productName = ''
- //formData.value.details = ''
+ formData.value.details = ''
}
let printData = JSON.stringify(formData.value)
@@ -377,11 +378,11 @@ const preview = async () => {
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 details = formData.value.details || ''
+ const remarks2 = formData.value.remarks2 || ''
if(remarks){
- formData.value.remarksText = remarks + '\n' +details
+ formData.value.remarksText = remarks + '\n \n' +remarks2
}else {
- formData.value.remarksText = details
+ formData.value.remarksText = remarks2
}
//formData.value.saleContractNo = formData.value.orderNo
@@ -389,11 +390,11 @@ const preview = async () => {
const material = await ProductInfoApi.getProductInfo(formData.value.productId)
formData.value.productCode = material.code
formData.value.productName = material.name
- //formData.value.details = material.productionInfo
+ formData.value.details = material.productionInfo
}else {
formData.value.productCode = ''
formData.value.productName = ''
- //formData.value.details = ''
+ formData.value.details = ''
}
diff --git a/hangtag-ui/hangtag-ui-front/src/components/Search/src/Search.vue b/hangtag-ui/hangtag-ui-front/src/components/Search/src/Search.vue
index e8d4538..c1d0737 100644
--- a/hangtag-ui/hangtag-ui-front/src/components/Search/src/Search.vue
+++ b/hangtag-ui/hangtag-ui-front/src/components/Search/src/Search.vue
@@ -47,7 +47,7 @@ const visible = ref(true)
const newSchema = computed(() => {
let schema: FormSchema[] = cloneDeep(props.schema)
if (props.expand && props.expandField && !unref(visible)) {
- const index = findIndex(schema, (v: FormSchema) => props.expandField.indexOf(v.field) === -1)
+ const index = findIndex(schema, (v: FormSchema) => v.field === props.expandField)
if (index > -1) {
const length = schema.length
schema.splice(index + 1, length)