rev:等级修改
This commit is contained in:
@@ -42,6 +42,13 @@ public class HandNewMaterialController {
|
|||||||
return new ResponseEntity<>(handNewMaterialService.checkBucket(whereJson), HttpStatus.OK);
|
return new ResponseEntity<>(handNewMaterialService.checkBucket(whereJson), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/getIvtLevel")
|
||||||
|
@Log("获取库存等级")
|
||||||
|
@ApiOperation("获取库存等级")
|
||||||
|
public ResponseEntity<Object> checkBucket() {
|
||||||
|
return new ResponseEntity<>(handNewMaterialService.getIvtLevel(), HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping("/confirmVehicle")
|
@PostMapping("/confirmVehicle")
|
||||||
@Log("确认组盘")
|
@Log("确认组盘")
|
||||||
@ApiOperation("确认组盘")
|
@ApiOperation("确认组盘")
|
||||||
|
|||||||
@@ -109,4 +109,10 @@ public interface HandNewMaterialService {
|
|||||||
* @return Map
|
* @return Map
|
||||||
*/
|
*/
|
||||||
Map<String, Object> insideInConfirm(JSONObject whereJson);
|
Map<String, Object> insideInConfirm(JSONObject whereJson);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取库存等级
|
||||||
|
* @return Map<String, Object> 字典内容
|
||||||
|
*/
|
||||||
|
Map<String, Object> getIvtLevel();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -490,6 +490,18 @@
|
|||||||
ENDQUERY
|
ENDQUERY
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
|
IF 输入.flag = "14"
|
||||||
|
QUERY
|
||||||
|
SELECT
|
||||||
|
*
|
||||||
|
FROM
|
||||||
|
sys_dict_detail
|
||||||
|
WHERE
|
||||||
|
name = 'ST_IVT_LEVEL'
|
||||||
|
ENDSELECT
|
||||||
|
ENDQUERY
|
||||||
|
ENDIF
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -189,7 +189,6 @@
|
|||||||
clearable
|
clearable
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
placeholder="无"
|
placeholder="无"
|
||||||
:disabled="mater_btn || scope.row.edit"
|
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in dict.ST_IVT_LEVEL"
|
v-for="item in dict.ST_IVT_LEVEL"
|
||||||
@@ -447,8 +446,8 @@ export default {
|
|||||||
},
|
},
|
||||||
handleEdit(index, row) {
|
handleEdit(index, row) {
|
||||||
if (!row.edit) {
|
if (!row.edit) {
|
||||||
if (!row.material_id || !row.plan_qty || parseFloat(row.plan_qty) <= 0 || !row.pcsn) {
|
if (!row.material_id || !row.plan_qty || parseFloat(row.plan_qty) <= 0 || !row.pcsn || !row.ivt_level) {
|
||||||
this.crud.notify('物料、数量、批次不可为空!', CRUD.NOTIFICATION_TYPE.INFO)
|
this.crud.notify('物料、数量、批次、库存等级不可为空!', CRUD.NOTIFICATION_TYPE.INFO)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -479,7 +478,6 @@ export default {
|
|||||||
if (same_mater) {
|
if (same_mater) {
|
||||||
item.edit = false
|
item.edit = false
|
||||||
item.quality_scode = '02'
|
item.quality_scode = '02'
|
||||||
item.ivt_level = '01'
|
|
||||||
item.is_active = '1'
|
item.is_active = '1'
|
||||||
item.plan_qty = item.need_qty
|
item.plan_qty = item.need_qty
|
||||||
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
|
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
|
||||||
|
|||||||
Reference in New Issue
Block a user