purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善请购单的明细导入excel逻辑

Browse Source
This commit is contained in:
jishenghua
2024-04-21 23:28:01 +08:00
parent 5bee16c60b
commit 46db957f87
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -921,6 +921,11 @@ public class DepotItemController {
List<Map<String, String>> detailList = new ArrayList<>();
for (int i = 2; i < src.getRows(); i++) {
String depotName = "", barCode = "", num = "", unitPrice = "", taxRate = "", remark = "";
if("QGD".equals(prefixNo)) {
barCode = ExcelUtils.getContent(src, i, 0);
num = ExcelUtils.getContent(src, i, 2);
remark = ExcelUtils.getContent(src, i, 3);
}
if("CGDD".equals(prefixNo) || "XSDD".equals(prefixNo)) {
barCode = ExcelUtils.getContent(src, i, 0);
num = ExcelUtils.getContent(src, i, 2);

BIN
jshERP-web/public/doc/apply_item_template.xls Normal file
View File

Binary file not shown.

2
jshERP-web/src/views/bill/PurchaseApplyList.vue
View File

@@ -98,7 +98,7 @@
</template>
<a-button icon="setting">列设置</a-button>
</a-popover>
<a-tooltip placement="left" title="采购订单不涉及付款金额，采购订单可以转采购入库单，但需要先对采购订单进行审核。
<a-tooltip placement="left" title="请购单只涉及数量，请购单可以转采购订单，但需要先对请购单进行审核。
勾选单据之后可以进行批量操作（删除、审核、反审核）" slot="action">
<a-icon v-if="btnEnableList.indexOf(1)>-1" type="question-circle" style="font-size:20px;float:right;" />
</a-tooltip>

12
jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
View File

@@ -160,14 +160,14 @@
{ title: '名称', key: 'name', width: '10%', type: FormTypes.normal },
{ title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
{ title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
{ title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
{ title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
{ title: '颜色', key: 'color', width: '6%', type: FormTypes.normal },
{ title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.normal },
{ title: '单位', key: 'unit', width: '6%', type: FormTypes.normal },
{ title: '多属性', key: 'sku', width: '10%', type: FormTypes.normal },
{ title: '数量', key: 'operNumber', width: '6%', type: FormTypes.inputNumber, statistics: true,
validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '备注', key: 'remark', width: '6%', type: FormTypes.input},
{ title: '备注', key: 'remark', width: '8%', type: FormTypes.input},
]
},
confirmLoading: false,