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 

# Conflicts:
#	hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
This commit is contained in:
Mrking 2025-01-19 18:25:45 +08:00
parent d35965748c f1f88ae4dc
commit 1618b15b01
9 changed files with 42 additions and 22 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;
}

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

@ -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);
}

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

@ -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);
}

8
hangtag-ui/hangtag-ui-admin/src/components/Search/src/Search.vue
View File

@ -97,6 +97,10 @@ const setVisible = () => {
unref(elFormRef)?.resetFields()
visible.value = !unref(visible)
}
defineExpose({
reset,
search
})
</script>
<template>
@ -131,8 +135,8 @@ const setVisible = () => {
<slot name="actionMore"></slot>
</div>
</template>
<template v-for="name in Object.keys($slots)" :key="name" #[name]>
<slot :name="name"></slot>
<template v-for="name in Object.keys($slots)" :key="name" #[name]="data">
<slot :name="name" :data="data" ></slot>
</template>
</Form>

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

@ -158,8 +158,8 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="details">
<el-input v-model="formData.details" placeholder="请输入备注" />
<el-form-item label="备注" prop="remarks2">
<el-input v-model="formData.remarks2" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
@ -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 = ''
}

2
hangtag-ui/hangtag-ui-front/src/components/Search/src/Search.vue
View File

@ -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)