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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-01-29 02:08:31 +08:00
parent b2fea5b051 cb76304a6a
commit 8494e7ccbd
31 changed files with 588 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java
View File

@@ -10,6 +10,7 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.modules.logging.annotation.Log;
import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.dao.Param;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
@@ -33,7 +34,6 @@ import java.util.Map;
@RequestMapping("/api/param")
@RequiredArgsConstructor
class SysParamController {
private final ISysParamService paramService;
@GetMapping
@Log("查询系统参数")

6
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -821,6 +821,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
String thickness_request = detail.getString("Attribute2");//物料主数据厚度
String width_standard = detail.getString("Attribute3");//要求幅宽
//查询库内是否存在相同的子卷号
JSONObject container_jo = WQLObject.getWQLObject("PDM_BI_SubPackageRelation").query("container_name = '"+ContainerName+"'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(container_jo)){
throw new BadRequestException("LMS系统中已存在子卷号："+ContainerName+"，请检查！");
}
JSONObject jo = new JSONObject();
jo.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
jo.put("package_box_sn", PackageBoxSN);

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

@@ -115,7 +115,7 @@ public class BakingServiceImpl implements BakingService {
hotParam.put("workorder_id", jsonRaw.getString("workorder_id"));
hotParam.put("material_id", jsonMater.getString("material_id"));
hotParam.put("qty", jsonRaw.get("productin_qty"));
hotParam.put("io_type", "1");
hotParam.put("io_type", "0");
hotParam.put("qty_unit_id", jsonMater.getString("base_unit_id"));
hotParam.put("task_id", task_id);
hotParam.put("start_point_code", point_code1);

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

@@ -171,7 +171,7 @@ public class ShippingServiceImpl implements ShippingService {
throw new BadRequestException("未查询到可用的空点位！");
}
/*//如果为左边点位判断右边是否存在未完成的任务，如果有则提示不能下发
//如果为左边点位判断右边是否存在未完成的任务，如果有则提示不能下发
//判断输送出来的任务起点是否靠近分切机，如果靠近分切机且远离分切机的点位上存在载具且不存在任务进行载具横移
char dtl_type = empty_point.getString("point_code").charAt(empty_point.getString("point_code").length() - 1);
if (Integer.valueOf(String.valueOf(dtl_type)) % 2 != 0) {
@@ -179,9 +179,9 @@ public class ShippingServiceImpl implements ShippingService {
//判断是否存在任务
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("point_code1 = '"+right_point.getString("point_code")+"' OR point_code2 = '"+right_point.getString("point_code")+"' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task_jo)){
throw new BadRequestException("当前一截输送线存在未完成的任务，请稍等几分钟后进行下发！");
throw new BadRequestException(empty_point.getString("point_code")+"所在一截输送线存在未完成的任务，请稍等几分钟后进行下发！");
}
}*/
}
//下发输送线任务
JSONObject form = new JSONObject();

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

@@ -89,7 +89,7 @@
PDM_BI_SlittingProductionPlan plan
LEFT JOIN st_ivt_cutpointivt ivt ON ivt.ext_code = plan.resource_name
WHERE
plan.STATUS < 09
plan.STATUS <> '09'
AND
is_child_tz_ok = 0
AND

14
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/ProductInstorController.java
View File

@@ -44,4 +44,18 @@ public class ProductInstorController {
return new ResponseEntity<>(productInstorService.confirm(whereJson),HttpStatus.OK);
}
@PostMapping("/mendCode")
@Log("补码")
@ApiOperation("补码")
public ResponseEntity<Object> mendCode(@RequestBody JSONObject whereJson){
return new ResponseEntity<>(productInstorService.mendCode(whereJson),HttpStatus.OK);
}
@PostMapping("/bale")
@Log("捆扎")
@ApiOperation("捆扎")
public ResponseEntity<Object> bale(@RequestBody JSONObject whereJson){
return new ResponseEntity<>(productInstorService.bale(whereJson),HttpStatus.OK);
}
}

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/ProductInstorService.java
View File

@@ -19,4 +19,8 @@ public interface ProductInstorService {
JSONObject boxQuery(JSONObject whereJson);
JSONObject confirm(JSONObject whereJson);
JSONObject mendCode(JSONObject whereJson);
JSONObject bale(JSONObject whereJson);
}

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java
View File

@@ -55,9 +55,13 @@ public class PdaCheckServiceImpl implements PdaCheckService {
@Override
public JSONObject checkQueryDtl(JSONObject whereJson) {
String box_no = whereJson.getString("box_no");
JSONObject map = new JSONObject();
map.put("flag", "2");
map.put("check_code", whereJson.getString("check_code"));
if (ObjectUtil.isNotEmpty(box_no)) map.put("storagevehicle_code","%"+box_no+"%");
JSONArray resultJSONArray = WQL.getWO("PDA_CHECK").addParamMap(map).process().getResultJSONArray(0);
JSONObject jo = new JSONObject();

60
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
View File

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
@@ -16,6 +17,8 @@ import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl;
import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
import org.nl.wms.pda.st.service.CoolInService;
import org.nl.wms.pda.st.service.ProductInstorService;
import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -248,4 +251,61 @@ public class ProductInstorServiceImpl implements ProductInstorService {
jo.put("message", "确认成功！");
return jo;
}
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject mendCode(JSONObject whereJson) {
String vehicle_code = whereJson.getString("box_no");
if (ObjectUtil.isEmpty(vehicle_code)) throw new BadRequestException("木箱号不能为空");
JSONObject param = new JSONObject();
param.put("vehicle_code",vehicle_code);
param.put("type","1");
AcsToWmsServiceImpl bean = SpringContextHolder.getBean(AcsToWmsServiceImpl.class);
bean.deviceApply(param);
JSONObject jo = new JSONObject();
jo.put("message", "补码成功！");
return jo;
}
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject bale(JSONObject whereJson) {
String vehicle_code = whereJson.getString("box_no");
String point_code = whereJson.getString("point_code");
if (StrUtil.isEmpty(vehicle_code)) {
throw new BadRequestException("木箱码不能为空！");
}
if (StrUtil.isEmpty(point_code)) {
throw new BadRequestException("点位不能为空！");
}
JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(sub_jo)) {
throw new BadRequestException("未查询到该木箱对应的包装关系！");
}
String box_length = sub_jo.getString("box_length");
String box_width = sub_jo.getString("box_width");
String box_high = sub_jo.getString("box_high");
JSONArray array = new JSONArray();
JSONObject jsonLength = new JSONObject();
jsonLength.put("device_code", point_code);
jsonLength.put("code", "");
jsonLength.put("value", box_length);
array.add(jsonLength);
// 调用接口返回数据
WmsToAcsServiceImpl wmsToAcsServiceImpl = SpringContextHolder.getBean(WmsToAcsServiceImpl.class);
wmsToAcsServiceImpl.action(array);
JSONObject jo = new JSONObject();
jo.put("message", "捆扎成功！");
return jo;
}
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java
View File

@@ -71,7 +71,7 @@ public class ProductionOutServiceImpl implements ProductionOutService {
* 生产区确认
* a.解锁出库点位、清除木箱号
*/
jsonPoint.put("point_status", "00");
jsonPoint.put("point_status", "1");
jsonPoint.put("lock_type", "1");
jsonPoint.put("vehicle_code", "");
jsonPoint.put("vehicle_type", "");

25
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql
View File

@@ -116,8 +116,8 @@
dtl.storagevehicle_code,
mater.material_code,
mater.material_name,
ROUND(dtl.base_qty) AS base_qty,
ROUND(dtl.fac_qty) AS fac_qty,
ROUND(dtl.base_qty,3) AS net_qty,
ROUND(dtl.fac_qty,3) AS fac_qty,
dtl.qty_unit_name,
(
CASE
@@ -142,6 +142,10 @@
dtl.check_code = 输入.check_code
ENDOPTION
OPTION 输入.storagevehicle_code <> ""
dtl.storagevehicle_code like 输入.storagevehicle_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
@@ -186,3 +190,20 @@
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "4"
QUERY
SELECT
SUM(net_weight) AS net_weight
FROM
pdm_bi_subpackagerelation
WHERE
1=1
OPTION 输入.storagevehicle_code <> ""
package_box_sn = 输入.storagevehicle_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF

46
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -186,7 +186,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
JSONObject material = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + row.get("product_name") + "'").uniqueResult(0);
row.put("material_id", material.getString("material_id"));
row.put("pcsn", row.get("container_name"));
row.put("bill_status", "30");
row.put("bill_status", "10");
row.put("quality_scode", "01");
row.put("qty_unit_id", material.getString("base_unit_id"));
JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + material.getString("base_unit_id") + "'").uniqueResult(0);
@@ -356,7 +356,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
JSONObject material = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + row.get("product_name") + "'").uniqueResult(0);
row.put("material_id", material.getString("material_id"));
row.put("pcsn", row.get("container_name"));
row.put("bill_status", "30");
row.put("bill_status", "10");
row.put("quality_scode", "01");
row.put("qty_unit_id", material.getString("base_unit_id"));
JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id = '" + material.getString("base_unit_id") + "'").uniqueResult(0);
@@ -472,7 +472,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
HashMap<String, String> map = rows.get(0);
Boolean auto_div = false;
if (whereJson2.containsKey("auto_div")){
if (whereJson2.containsKey("auto_div")) {
auto_div = whereJson2.getBoolean("auto_div");
}
//判断该载具是否已经分配货位或者起点
@@ -605,9 +605,8 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
i_form.put("qty_unit_name", dis_jo.getString("qty_unit_name"));
storPublicService.IOStor(i_form, "31");
JSONObject dtl_jo = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id = '" + dis_jo.getString("iostorinvdtl_id") + "'").uniqueResult(0);
if (StrUtil.isNotEmpty(ios_dis.getString("point_id")) || is_virtual) {
//更新明细表状态
JSONObject dtl_jo = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id = '" + dis_jo.getString("iostorinvdtl_id") + "'").uniqueResult(0);
if (dtl_jo.getDoubleValue("unassign_qty") == 0) {
//判断该明细下是否还存在未分配货位的分配明细
JSONArray disdiv_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinvdtl_id = '" + dis_jo.getString("iostorinvdtl_id") + "' AND (struct_id = '' OR struct_id is null) AND (point_id = '' OR point_id is null)").getResultJSONArray(0);
@@ -622,9 +621,23 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
mst_jo.put("dis_optname", nickName);
mst_jo.put("dis_time", now);
WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
} else {
mst_jo.put("bill_status", "30");
mst_jo.put("dis_optid", currentUserId);
mst_jo.put("dis_optname", nickName);
mst_jo.put("dis_time", now);
WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
}
}
}
} else {
dtl_jo.put("bill_status", "30");
WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(dtl_jo);
mst_jo.put("bill_status", "30");
mst_jo.put("dis_optid", currentUserId);
mst_jo.put("dis_optname", nickName);
mst_jo.put("dis_time", now);
WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
}
}
//如果是虚拟区，直接更新完成分配任务
@@ -696,9 +709,11 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(map, "iostorinv_id = '" + mst_jo.get("iostorinv_id") + "' AND box_no = '" + whereJson.get("box_no") + "'");
//修改明细状态
JSONObject dtl_jo = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id = '" + dis_rows.getJSONObject(0).getString("iostorinvdtl_id") + "'").uniqueResult(0);
HashMap<String, String> dtl_map = new HashMap<>();
map.put("bill_status", "30");
WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(map, "iostorinv_id = '" + mst_jo.get("iostorinv_id") + "' AND box_no = '" + whereJson.get("box_no") + "'");
dtl_map.put("bill_status", "10");
WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(dtl_map, "iostorinv_id = '" + mst_jo.get("iostorinv_id") + "' AND box_no = '" + whereJson.get("box_no") + "'");
//更新主表状态
JSONArray dtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinv_id = '" + mst_jo.get("iostorinv_id") + "' AND bill_status IN ('20','30')").getResultJSONArray(0);
@@ -843,10 +858,19 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
//根据分切计划查询该订单物料大概还有多少未入
row_map.put("flag", "12");
JSONArray plan_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(row_map).process().getResultJSONArray(0);
int box_num = (int) Math.ceil(plan_rows.size() / 2);
if (ObjectUtil.isEmpty(plan_rows)){
plan_rows = new JSONArray();
}
//查询该销售订单及行号有多少个生成状态的箱子
row_map.put("flag", "27");
JSONArray box_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(row_map).process().getResultJSONArray(0);
if (ObjectUtil.isEmpty(box_rows)){
box_rows = new JSONArray();
}
int box_num = (int) Math.ceil(plan_rows.size() / 2) + box_rows.size();
//查询数量与订单物料箱子数量相近的一排
JSONObject empty_row = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("sect_id", sect_id).addParam("flag", "13").addParam("sql_str", " ORDER BY abs(" + box_num + "-a.struct_num)").process().uniqueResult(0);
JSONObject empty_row = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("sect_id", sect_id).addParam("flag", "13").addParam("sql_str", " ORDER BY abs(" + box_num + "-a.struct_num),block_num,row_num").process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(empty_row)) {
String block_num = empty_row.getString("block_num");
String row_num = empty_row.getString("row_num");
@@ -1059,7 +1083,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
//修改明细状态
HashMap<String, String> dtl_map = new HashMap<>();
map.put("bill_status", "30");
map.put("bill_status", "10");
WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(map, "iostorinv_id = '" + mst_jo.get("iostorinv_id") + "' AND box_no = '" + whereJson.get("box_no") + "'");
//更新主表状态
@@ -1077,7 +1101,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
public void reIssueTask(Map whereJson) {
String task_id = (String) whereJson.get("task_id");
//判断指令状态，只能下发生成、执行中状态的任务
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_id = '"+task_id+"'").uniqueResult(0);
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_id = '" + task_id + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(task_jo)) {
throw new BadRequestException("请输入正确的任务号！");
}

13
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
View File

@@ -930,6 +930,19 @@
ENDQUERY
ENDIF
IF 输入.flag = "27"
QUERY
SELECT DISTINCT
package_box_sn
FROM
pdm_bi_subpackagerelation
WHERE
sale_order_name = 输入.sale_order_name
AND `status` = '0'
ENDSELECT
ENDQUERY
ENDIF

6
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java
View File

@@ -187,6 +187,9 @@ public class CheckServiceImpl implements CheckService {
jsonDtl.put("qty_unit_id", json.getLongValue("measure_unit_id"));
jsonDtl.put("qty_unit_name", json.getString("qty_unit_name"));
jsonDtl.put("status", "1");
JSONObject jsonSub = WQL.getWO("PDA_CHECK").addParam("flag", "4").addParam("storagevehicle_code", json.getString("storagevehicle_code")).process().uniqueResult(0);
jsonDtl.put("base_qty", jsonSub.getDoubleValue("net_weight"));
dtlTab.insert(jsonDtl);
}
}
@@ -286,6 +289,9 @@ public class CheckServiceImpl implements CheckService {
jsonDtl.put("qty_unit_name", json.getString("qty_unit_name"));
jsonDtl.put("status", "1");
jsonDtl.put("fac_qty", json.getDoubleValue("fac_qty"));
JSONObject jsonSub = WQL.getWO("PDA_CHECK").addParam("flag", "4").addParam("storagevehicle_code", json.getString("storagevehicle_code")).process().uniqueResult(0);
jsonDtl.put("base_qty", jsonSub.getDoubleValue("net_weight"));
dtlTab.insert(jsonDtl);
}
}

2
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
View File

@@ -341,7 +341,7 @@
CheckDtl.storagevehicle_id,
CheckDtl.storagevehicle_code,
CheckDtl.material_id,
CheckDtl.base_qty,
ROUND(CheckDtl.base_qty,3) AS base_qty,
CheckDtl.qty_unit_id,
CheckDtl.qty_unit_name,
CheckDtl.STATUS,

2
lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue
View File

@@ -84,7 +84,7 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="interface_type" label="回传类型" :formatter="formatType" :min-width="flexWidth('interface_type',crud.data,'类型')" />
<el-table-column prop="interface_type" label="回传类型" :formatter="formatType" :min-width="flexWidth('interface_type',crud.data,'回传类型')" />
<el-table-column prop="interface_name" label="接口名称" :min-width="flexWidth('interface_name',crud.data,'接口名称')"/>
<el-table-column prop="is_back" label="是否回传" :formatter="formatBack" :min-width="flexWidth('is_back',crud.data,'是否回传')"/>
<el-table-column prop="remark" label="接口描述" :min-width="flexWidth('remark',crud.data,'接口描述')"/>

2
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -425,7 +425,7 @@
</template>
</el-table-column>
<el-table-column prop="un_plan_product_property1" label="子卷的物性值1"
:min-width="flexWidth('un_plan_product_property1',crud.data,'子卷的物性值1')"/>
:min-width="flexWidth('un_plan_product_property1',crud.data,'子卷的物性值1',-220)"/>
<el-table-column prop="un_plan_product_property2" label="子卷的物性值2"
:min-width="flexWidth('un_plan_product_property2',crud.data,'子卷的物性值2')"/>
<el-table-column prop="un_plan_product_property3" label="子卷的物性值3"

19
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -112,7 +112,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column prop="task_type_name" label="任务类型" min-width="150" show-overflow-tooltip />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<el-table-column prop="point_code1" label="取货点1" width="100" show-overflow-tooltip />
<el-table-column prop="point_code2" label="放货点1" width="100" show-overflow-tooltip />
@@ -161,11 +161,11 @@
width="30%"
>
<!-- 组件-->
<component
<!--<component
:is="currentComponent"
:task-uuid="task_id"
:dialog-visible="viewDialogVisible"
/>
/>-->
<span slot="footer" class="dialog-footer">
<el-button @click="viewDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="viewDialogVisible = false">确 定</el-button>
@@ -200,7 +200,7 @@ export default {
sort: 'task_id,desc',
crudMethod: { ...crudTask },
query: {
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ''
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ['-1']
},
optShow: {
add: false,
@@ -236,10 +236,14 @@ export default {
crudTask.getFinishType().then(data => {
this.finishTypeList = data
})
this.crud.query.task_status = ['-1']
this.crud.toQuery()
// this.crud.query.task_status = ['-1']
// this.crud.toQuery()
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
initClass1() {
const param = {
parent_class_code: 'task_type'
@@ -263,6 +267,7 @@ export default {
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
debugger
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
@@ -277,9 +282,11 @@ export default {
}
},
hand(value) {
debugger
this.crud.toQuery()
},
handTaskStatus(value) {
debugger
if (value) {
this.query.task_status = this.task_status.toString()
}

1
lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue
View File

@@ -108,6 +108,7 @@
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150" align="center" />
<el-table-column prop="material_name" show-overflow-tooltip label="物料名称" align="center" width="170px" />
<el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" width="110px" />
<el-table-column prop="base_qty" label="净重" align="center" width="110px" />
<el-table-column show-overflow-tooltip prop="check_result" label="是否异常" align="center" width="210px">
<template scope="scope">
<el-select

2
lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
View File

@@ -216,7 +216,7 @@ export default {
this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (this.dis_row.work_status !== '01') {
if (this.dis_row.work_status !== '04') {
this.crud.notify('只能对状态为生成的任务进行删除！', CRUD.NOTIFICATION_TYPE.INFO)
return
}

8
lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
View File

@@ -109,7 +109,8 @@
<el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="pcsn" label="子卷号" width="150" align="center" />
<el-table-column prop="sap_pcsn" label="SAP批次号" width="150" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />
@@ -135,7 +136,8 @@
>
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="pcsn" label="子卷号" align="center" width="150"/>
<el-table-column prop="sap_pcsn" label="SAP批次号" align="center" />
<el-table-column prop="box_no" label="载具号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="next_point_code" label="起始位置" align="center" />
@@ -151,8 +153,6 @@
import { crud } from '@crud/crud'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudRawAssist from '@/views/wms/st/inbill/rawassist'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {

20
lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue
View File

@@ -31,6 +31,16 @@
</el-select>
</el-form-item>
<el-form-item label="物料编码">
<el-input
style="width: 220px"
v-model="query.material_code"
clearable
placeholder="物料编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="日期">
<label slot="label">日&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;期:</label>
<el-date-picker
@@ -44,15 +54,7 @@
</el-form-item>
<el-form-item label="物料编码">
<el-input
style="width: 220px"
v-model="query.material_code"
clearable
placeholder="物料编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="子卷批次">
<el-input