| rsf-admin/src/page/basicInfo/loc/LocList.jsx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| rsf-admin/src/page/orders/stock/OrderList.jsx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -221,8 +221,9 @@ {/* <TextField source="name" label="table.field.loc.name" /> */} {/* <NumberField source="flagLogic" label="table.field.loc.flagLogic" /> <TextField source="fucAtrrs" label="table.field.loc.fucAtrrs" /> <TextField source="barcode" label="table.field.loc.barcode" /> */} */} {/* <TextField source="unit" label="table.field.loc.unit" /> */} <TextField source="barcode" label="table.field.loc.barcode" /> <TextField source="length" label="table.field.loc.length" /> <TextField source="width" label="table.field.loc.width" /> <TextField source="height" label="table.field.loc.height" /> @@ -236,9 +237,9 @@ <NumberField source="flagLabelMange" label="table.field.loc.flagLabelMange" /> <TextField source="locAttrs" label="table.field.loc.locAttrs" /> */} <TextField source="useStatus$" label="table.field.loc.useStatus" /> <TextField source="updateBy$" label="common.field.updateBy" /> <TextField source="updateBy$" label="common.field.updateBy" /> <DateField source="updateTime" label="common.field.updateTime" showTime align="left" /> <TextField source="createBy$" label="common.field.createBy" /> <TextField source="createBy$" label="common.field.createBy" /> <DateField source="createTime" label="common.field.createTime" showTime align="left" /> <BooleanField source="statusBool" label="common.field.status" sortable={false} align="left" /> <TextField source="memo" label="common.field.memo" sortable={false} /> @@ -250,8 +251,8 @@ </StyledDatagrid> <InitModal open={initDialog} setOpen={setInitDialog} open={initDialog} setOpen={setInitDialog} /> </List> <LocCreate @@ -264,8 +265,8 @@ setDrawerVal={setDrawerVal} > </PageDrawer> </Box> ) } rsf-admin/src/page/orders/stock/OrderList.jsx
@@ -116,18 +116,20 @@ bulkActionButtons={false} rowClick='edit' expandSingle={false} omit={['id', 'createTime','sourceId', 'createBy', 'memo']} omit={['id', 'createTime', 'sourceId', 'createBy', 'memo']} > <NumberField source="id" /> <TextField source="code" label="table.field.stock.code" /> <TextField source="sourceCode" label="table.field.stock.sourceCode" /> <NumberField source="sourceId" label="table.field.stock.sourceId" /> <TextField source="locCode" label="table.field.locArea.locId" />, <TextField source="barcode" label="table.field.task.barcode" />, <TextField source="type$" label="table.field.stock.type" /> <TextField source="wkType$" label="table.field.stock.wkType" /> <NumberField source="anfme" label="table.field.stock.anfme" /> <TextField source="updateBy$" label="common.field.updateBy" /> <DateField source="updateTime" label="common.field.updateTime" showTime /> <TextField source="createBy$" label="common.field.createBy" /> <TextField source="createBy$" label="common.field.createBy" /> <DateField source="createTime" label="common.field.createTime" showTime /> <BooleanField source="statusBool" label="common.field.status" sortable={false} /> <TextField source="memo" label="common.field.memo" sortable={false} /> rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
@@ -79,6 +79,12 @@ @ApiModelProperty(value= "库存数量") private Double anfme; @ApiModelProperty(value= "条形码") private String barcode; @ApiModelProperty("库位") private String locCode; /** * 状态 1: 正常 0: 冻结 */ rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -545,7 +545,7 @@ TaskItem taskItem = taskItems.stream().findFirst().get(); //保存入出库流水 saveStockItems(taskItems, null, null, taskItem.getWkType(), taskItem.getOrderType()); saveStockItems(taskItems, task, null, null, taskItem.getWkType(), taskItem.getOrderType()); if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) { @@ -901,7 +901,7 @@ List<TaskItem> items = orderMap.get(key); try { //保存库存明细 saveStockItems(items, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType()); saveStockItems(items, task, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType()); //移出收货区库存， 修改组托状态 removeReceiptStock(pakinItem); } catch (Exception e) { @@ -989,7 +989,7 @@ * @return */ @Transactional(rollbackFor = Exception.class) public void saveStockItems(List<TaskItem> items, Long id, String code, Short wkType, String type) throws public void saveStockItems(List<TaskItem> items, Task task, Long id, String code, Short wkType, String type) throws Exception { Stock stock = new Stock(); String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null); @@ -1002,7 +1002,17 @@ .setSourceCode(code) .setAnfme(sum) .setWkType(wkType) .setBarcode(task.getBarcode()) .setType(type); if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type) ) { stock.setLocCode(task.getTargLoc()); } else { stock.setLocCode(task.getOrgLoc()); } if (!stockService.save(stock)) { throw new CoolException("库存保存失败！！"); } @@ -1014,6 +1024,7 @@ BeanUtils.copyProperties(item, stockItem); stockItem.setSourceItemId(item.getOrderItemId()) .setStockCode(stock.getCode()) .setBarcode(task.getBarcode()) .setSourceItemId(item.getOrderItemId()) .setId(null) .setStockId(stock.getId());
