root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-03-06 12:38:39 +08:00
parent 6d57e7cb66
commit d74b3c1ff4
8 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java
View File

@@ -55,4 +55,11 @@ public class FeedingController {
public ResponseEntity<Object> handleConfirm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(feedingService.handleConfirm(whereJson), HttpStatus.OK);
}
@PostMapping("/vehicleReturn")
@Log("空轴送回")
@ApiOperation("空轴送回")
public ResponseEntity<Object> vehicleReturn(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(feedingService.vehicleReturn(whereJson), HttpStatus.OK);
}
}

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/FeedingService.java
View File

@@ -37,4 +37,12 @@ public interface FeedingService {
*/
JSONObject handleConfirm(JSONObject whereJson);
/**
* 空轴送回
*
* @param whereJson /
* @return JSONObject
*/
JSONObject vehicleReturn(JSONObject whereJson);
}

47
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
View File

@@ -333,4 +333,51 @@ public class FeedingServiceImpl implements FeedingService {
result.put("message", "操作成功!");
return jo;
}
@Transactional(rollbackFor = Exception.class)
@Override
public JSONObject vehicleReturn(JSONObject form) {
String point_code = form.getString("point_code");
if (StrUtil.isEmpty(point_code)) {
throw new BadRequestException("输入的点位不能为空！");
}
//查询对应的分切点位是否存在
JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("empty_point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(cut_jo)) {
throw new BadRequestException("请输入或者扫码分切区域的空轴点位！");
}
if (StrUtil.equals("01", cut_jo.getString("empty_point_status"))) {
throw new BadRequestException("该点位库存状态不存在空轴！");
}
// 2.找冷却区空货位
JSONObject map = new JSONObject();
map.put("flag", "2");
map.put("product_area", cut_jo.getString("product_area"));
map.put("point_location", "0");
JSONObject jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
// 如果为空
if (ObjectUtil.isEmpty(jsonCooIvt)) {
map.put("point_location", "1");
jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
}
if (ObjectUtil.isEmpty(jsonCooIvt)) {
throw new BadRequestException("冷却区空位不足");
}
// 3.创建任务
JSONObject param = new JSONObject();
param.put("point_code1", point_code);
param.put("point_code2", jsonCooIvt.getString("empty_point_code"));
param.put("product_area", cut_jo.getString("product_area"));
param.put("task_type", "010303");
AbstractAcsTask task = new CoolCutTask();
task.createTask(param);
JSONObject result = new JSONObject();
result.put("message", "操作成功!");
return result;
}
}

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
View File

@@ -63,6 +63,9 @@
OPTION 输入.point_type <> ""
point_type = 输入.point_type
ENDOPTION
OPTION 输入.point_type = "5"
IFNULL(material_code,'') = ''
ENDOPTION
order by point_code ASC

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
View File

@@ -166,7 +166,7 @@
der.STATUS
WHEN '01' THEN '开始'
WHEN '02' THEN '空轴搬出'
WHEN '03' THEN '确认下卷'
WHEN '03' THEN '准备就绪'
WHEN '04' THEN '下卷完成'
WHEN '09' THEN '结束'
END

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
View File

@@ -234,7 +234,7 @@ public class CoolCutTask extends AbstractAcsTask {
WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2);
//更新冷却区空轴库存
JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0);
JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '" + point_code2 + "'").uniqueResult(0);
jsonCoolIvt2.put("empty_point_status", "02");
jsonCoolIvt2.put("empty_vehicle_code", jsonTask.getString("vehicle_code"));
jsonCoolIvt2.put("cool_ivt_status", "01");

23
lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
View File

@@ -91,30 +91,17 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
<el-input v-model="form.point_code" style="width: 370px;" disabled/>
</el-form-item>
<el-form-item label="满轴位编码">
<el-input v-model="form.full_point_code" style="width: 370px;" />
<el-input v-model="form.full_point_code" style="width: 370px;" disabled/>
</el-form-item>
<el-form-item label="空轴位编码">
<el-input v-model="form.empty_point_code" style="width: 370px;" disabled/>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item>

1
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -313,6 +313,7 @@
</template>
</el-table-column>-->
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料批次" :min-width="flexWidth('material_code',crud.data,'物料批次')" />
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />