From c860ca1d4ceaa4065ac5f0257d7b4181880acedd Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 11 五月 2024 08:59:10 +0800
Subject: [PATCH] -接收工单
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 20 ++++++++--
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java | 2
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java | 32 +++++++++++----
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 37 ++++++++++++++++++
jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml | 12 +++---
5 files changed, 83 insertions(+), 20 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
index 7b64a28..8d5d721 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -153,7 +153,7 @@
public int jrmAddPassingStationCollection(DaPassingStationCollection daPassingStationCollection) {
for (String model : daPassingStationCollection.getSfcCode().split(",")) {
daPassingStationCollection.setSfcCode(model);
- boolean save = daPassingStationCollectionService.save(daPassingStationCollection);
+ daPassingStationCollectionService.save(daPassingStationCollection);
}
return 1;
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index 939f970..75e574a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -5,13 +5,18 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jcdm.common.core.domain.entity.SysUser;
import com.jcdm.common.core.domain.model.LoginUser;
import com.jcdm.common.utils.ServletUtils;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfoExcelImport;
+import com.jcdm.main.om.productionOrde.mapper.OmProductionOrdeInfoMapper;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
+import com.jcdm.main.restful.factoryMes.service.RestfulService;
+import org.aspectj.weaver.loadtime.Aj;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -69,6 +74,38 @@
util.exportExcel(response, list, "鐢熶骇宸ュ崟鏁版嵁");
}
+ @GetMapping("/receivingWorkOrders")
+ public AjaxResult receivingWorkOrders()
+ {
+ String paramProductNum = "";
+ // 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅
+ List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().orderByAsc(OmProductionOrdeInfo::getCreateTime));
+ if(list.size() > 0){
+ paramProductNum = list.get(list.size()-1).getProductNum();
+ }
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "POP230");
+ JSONObject jsonObject = new JSONObject(orderJsonString);
+ // 浠嶫SONObject涓幏鍙杁ata瀵硅薄
+ JSONObject dataObject = jsonObject.getJSONObject("data");
+ String code = jsonObject.getStr("code");
+ // 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛
+ if(code.equals("success")){
+ OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
+ omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
+ omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
+ omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
+ omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
+ omProductionOrdeInfo.setCreateTime(new Date());
+ omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
+
+ omProductionOrdeInfoService.save(omProductionOrdeInfo);
+ }else {
+ return AjaxResult.error("鎺ュ崟澶辫触,璇疯仈绯荤鐞嗗憳");
+ }
+
+ return AjaxResult.success(dataObject.getStr("productNum"));
+ }
+
/**
* 鑾峰彇鐢熶骇宸ュ崟璇︾粏淇℃伅
*/
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
index 7fdb98d..fec6e50 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
@@ -142,6 +142,10 @@
@Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂�")
private String orderStatus;
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
/** 鍒涘缓浜� */
@Excel(name = "鍒涘缓浜�")
private String createUser;
@@ -164,7 +168,7 @@
/** 甯傚満鍖哄煙缂栫爜 */
@Excel(name = "甯傚満鍖哄煙缂栫爜")
- private String marketAreaCode;
+ private String materialCode;
/** 杞欢鐗堟湰缂栫爜 */
@Excel(name = "杞欢鐗堟湰缂栫爜")
@@ -191,6 +195,17 @@
@TableField(exist = false)
private String flag;
+
+
+ @Override
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ @Override
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
public String getProductModel() {
return productModel;
@@ -526,16 +541,16 @@
{
return custom;
}
- public void setMarketAreaCode(String marketAreaCode)
- {
- this.marketAreaCode = marketAreaCode;
+
+ public String getMaterialCode() {
+ return materialCode;
}
- public String getMarketAreaCode()
- {
- return marketAreaCode;
+ public void setMaterialCode(String materialCode) {
+ this.materialCode = materialCode;
}
- public void setSoftwareVersionCode(String softwareVersionCode)
+
+ public void setSoftwareVersionCode(String softwareVersionCode)
{
this.softwareVersionCode = softwareVersionCode;
}
@@ -624,7 +639,6 @@
.append("remarks", getRemarks())
.append("streamNumber", getStreamNumber())
.append("custom", getCustom())
- .append("marketAreaCode", getMarketAreaCode())
.append("softwareVersionCode", getSoftwareVersionCode())
.append("productCompanyCode", getProductCompanyCode())
.append("spareField2", getSpareField2())
diff --git a/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml b/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
index b33cd04..a8698ef 100644
--- a/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
@@ -36,7 +36,7 @@
<result property="remarks" column="remarks" />
<result property="streamNumber" column="stream_number" />
<result property="custom" column="custom" />
- <result property="marketAreaCode" column="market_area_code" />
+ <result property="materialCode" column="material_code" />
<result property="softwareVersionCode" column="software_version_code" />
<result property="productCompanyCode" column="product_company_code" />
<result property="trolleyYard" column="trolley_yard" />
@@ -54,7 +54,7 @@
</resultMap>
<sql id="selectOmProductionOrdeInfoVo">
- select id,site_code,product_num,station_code, product_model,result_code,result_text,sf_result ,work_order_no, sales_order_code, product_code, product_name, workshop_code, line_code, route_code, bom_code, recipe_code, plan_qty, actual_qty, bad_qty, scrap_qty, repair_qty, actual_online_qty, online_completion_mark, demand_date, plan_start_time, plan_end_time, actual_start_time, actual_end_time, serial_number, order_status, create_time, update_time, create_user, update_user, remarks, stream_number, custom, market_area_code, software_version_code, product_company_code, trolley_yard, spare_field2, spare_field3, spare_field4 from om_production_orde_info
+ select id,site_code,product_num,station_code, product_model,result_code,result_text,sf_result ,work_order_no, sales_order_code, product_code, product_name, workshop_code, line_code, route_code, bom_code, recipe_code, plan_qty, actual_qty, bad_qty, scrap_qty, repair_qty, actual_online_qty, online_completion_mark, demand_date, plan_start_time, plan_end_time, actual_start_time, actual_end_time, serial_number, order_status, create_time, update_time, create_user, update_user, remarks, stream_number, custom, material_code, software_version_code, product_company_code, trolley_yard, spare_field2, spare_field3, spare_field4 from om_production_orde_info
</sql>
<select id="selectOmProductionOrdeInfoList" parameterType="OmProductionOrdeInfo" resultMap="OmProductionOrdeInfoResult">
@@ -72,7 +72,7 @@
<if test="recipeCode != null and recipeCode != ''"> and recipe_code like concat('%', #{recipeCode}, '%')</if>
<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
<if test="custom != null and custom != ''"> and custom like concat('%', #{custom}, '%')</if>
- <if test="marketAreaCode != null and marketAreaCode != ''"> and market_area_code like concat('%', #{marketAreaCode}, '%')</if>
+ <if test="materialCode != null and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
<if test="softwareVersionCode != null and softwareVersionCode != ''"> and software_version_code like concat('%', #{softwareVersionCode}, '%')</if>
<if test="productCompanyCode != null and productCompanyCode != ''"> and product_company_code like concat('%', #{productCompanyCode}, '%')</if>
<if test="siteCode != null and siteCode != ''"> and site_code = #{siteCode}</if>
@@ -124,7 +124,7 @@
<if test="remarks != null">remarks,</if>
<if test="streamNumber != null">stream_number,</if>
<if test="custom != null">custom,</if>
- <if test="marketAreaCode != null">market_area_code,</if>
+ <if test="materialCode != null">material_code,</if>
<if test="softwareVersionCode != null">software_version_code,</if>
<if test="productCompanyCode != null">product_company_code,</if>
<if test="trolleyYard != null">trolley_yard,</if>
@@ -172,7 +172,7 @@
<if test="remarks != null">#{remarks},</if>
<if test="streamNumber != null">#{streamNumber},</if>
<if test="custom != null">#{custom},</if>
- <if test="marketAreaCode != null">#{marketAreaCode},</if>
+ <if test="materialCode != null">#{materialCode},</if>
<if test="softwareVersionCode != null">#{softwareVersionCode},</if>
<if test="productCompanyCode != null">#{productCompanyCode},</if>
<if test="trolleyYard != null">#{trolleyYard},</if>
@@ -223,7 +223,7 @@
<if test="remarks != null">remarks = #{remarks},</if>
<if test="streamNumber != null">stream_number = #{streamNumber},</if>
<if test="custom != null">custom = #{custom},</if>
- <if test="marketAreaCode != null">market_area_code = #{marketAreaCode},</if>
+ <if test="materialCode != null">material_code = #{materialCode},</if>
<if test="softwareVersionCode != null">software_version_code = #{softwareVersionCode},</if>
<if test="productCompanyCode != null">product_company_code = #{productCompanyCode},</if>
<if test="trolleyYard != null">trolley_yard = #{trolleyYard},</if>
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 70b91a2..ade8ab0 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -126,7 +126,7 @@
plain
icon="el-icon-download"
size="mini"
- @click="receivingWorkOrders"
+ @click="getWorkOrders"
>鎺ユ敹</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -273,7 +273,16 @@
import { listProductBom } from "@/api/main/bs/ProductBom/ProductBom";
import { listTechnologyRoute} from "@/api/main/bs/technologyRoute/technologyRoute";
import ItemSelect from "@/components/itemSelect/single.vue";
-import { importTemplate, upDownMove, listProductionOrde, getProductionOrde, delProductionOrde, addProductionOrde, updateProductionOrde } from "@/api/main/om/productionOrde/productionOrde";
+import {
+ importTemplate,
+ upDownMove,
+ listProductionOrde,
+ getProductionOrde,
+ delProductionOrde,
+ addProductionOrde,
+ updateProductionOrde,
+ receivingWorkOrders
+} from "@/api/main/om/productionOrde/productionOrde";
export default {
name: "ProductionOrde",
@@ -375,8 +384,11 @@
this.initWorkshop();
},
methods: {
- receivingWorkOrders(){
-
+ getWorkOrders(){
+ receivingWorkOrders().then(response => {
+ this.$modal.msgSuccess(response.msg);
+ this.getList()
+ });
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
--
Gitblit v1.9.3