From 19737d8d8e32f9ea682519b280d249624cd9d400 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 20 Mar 2023 17:25:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql | 10 ++-- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 210944 -> 245248 bytes .../sch/service/impl/RegionServiceImpl.java | 50 +++++++++--------- mes/qd/src/views/wms/pdm/device/index.vue | 16 +++--- mes/qd/src/views/wms/sch/point/index.vue | 3 +- 5 files changed, 38 insertions(+), 41 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql index d331cafd..3b06dc29 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql @@ -15,8 +15,8 @@ ################################################# 输入.flag TYPEAS s_string 输入.jockey_id TYPEAS s_string - 输入.sale_id TYPEAS s_string - 输入.produceorder_id TYPEAS s_string + 输入.sale_id TYPEAS s_string + 输入.produceorder_id TYPEAS s_string 输入.workprocedure_code TYPEAS s_string 输入.order_status TYPEAS s_string 输入.shift_type_scode TYPEAS s_string @@ -75,7 +75,7 @@ ShiftOrder.workorder_status <> '5' ENDOPTION OPTION 输入.order_status <> "" - find_in_set( ShiftOrder.workorder_status, 输入.order_status) + find_in_set(ShiftOrder.workorder_status, 输入.order_status) ENDOPTION OPTION 输入.shift_type_scode <> "" ShiftOrder.shift_type_scode = 输入.shift_type_scode @@ -87,10 +87,10 @@ material.product_series in 输入.product_series ENDOPTION OPTION 输入.begin_time <> "" - ShiftOrder.produce_date >= 输入.begin_time + ShiftOrder.realproducestart_date >= 输入.begin_time ENDOPTION OPTION 输入.end_time <> "" - ShiftOrder.produce_date <= 输入.end_time + ShiftOrder.realproducestart_date <= 输入.end_time ENDOPTION OPTION 输入.sale_id <> "" ShiftOrder.sale_id like 输入.sale_id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index d3f24c681abf23b11260b4ae91db58f8c1536eab..1670c50555f74c162555ae3434926e18dc5a9976 100644 GIT binary patch delta 42864 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

P+0#dw{ZwL5p{_4)uvoQ)m4s z2$dM48c8}bl1bvT_ecT)j0D(-b`CO{)spTZkuC5%Xmk*!K*&PlMFFMu5hh2YkfT&` zQ!42@%vK(4dr-8%M<74ZM-wWDC`iwj&`Pi2f{3gX$46JL4-l}kV8t&+|zmuj=y%B5GCa%s6#Qzlh|{Gg*o4RUAxQt8bM zNqV1;ByGdr^O&b>x*}BPUqSrJ>)+x{JE|TXKd}GX(~=+Rw$(n^vMp`~FG;fS(UhTC z>G|69#EkSgYPaS^CDd0gC)2Z1)CK)EITX`s-OwgnKRq{l)=DQjYewcEEHXK*4n3$2 zlK4qnyJ^(lp|jPO{2HoizivH#px8_&q$a4xdhwij{EBg*IVm&M7H?E zNUhG#^9;|P!OO~53=hxFOv*-K*#&aX(3BMWq50|^#=YqLJhvU`?w(mW%jL9dShjcsaf=a+8h@FUGDRv^2J=9D7?zqgLVZLho_HUU~7y1V?d2X&E%jReXH! z*&mBt57zG#-W8erWF+^D%eR`{z@%obLaN+sl%vX?l@*L1V@76HU3AWzqoUJoeDZtBS9reUUpL+E{U1~ElicEa z|A#Mh-Ek();@HjeKcZ7#S6^z_zvrKvpC28n9cpnzd?wblDy;Wotnhq>7h~_`c$lkV zhq|s@;-+)!Z!1Y0xzf*-)`TB8`-@d0{}Yi(|BxVwwr;9SPercx1AXf29|o4(SMCZFnT$(I-yt#m$XhblZK9F8XSg~hBO}jEEbyo^@kC=2 zGiInIfx)d3X`)-1AhoKVzjIB3^NnnNHb0%Oa8Kqdz4-iE>k>@}|5C)aCYwz{_){Lv zEcD`g@$>7yZScBe;l-cw*@%W|gyY4}o)vre^m>aY79Si<;>+DFYK{xuv8nO)GCXDk9Fu7F85U zQb?tcmO&zad8vi88WK78TnT9vBpswRkk&z33yFcW9ul$nG2@&`H?7P$zz9?5uRRbu zx5?CYZA?H$2E0xOJo zh=xCgaOQPm{0nJY%P=_i@`KYaHJpAW0Zn426w(glZ31Ewy)uWc!)xc$gXkv}Uo%1T zX%+Tn=Fg`CCylr(@@o@a6+OtkBQjnr85BA`bg_I0vO0**Xa~c-*SA`ZERORQDSqL3 zd3eE@;ebJ_w>i0p-INe3sz;3JJJ5Hoh3{+&a$l&iK$_n0A?UN&7L<6G5u9kbGI$fM zWs0}Zn%%kdCE@?ILF9OX1Y1vdOlcu4wG4c#*)@fxZ#%%=Z4mBz8L(LdP3Lgeyn=PTk79{I+T5?i0)~rd`sF|M7y~Y7rtJ$FKaCH zE%gy|Sz|eKY44Re_PC6>??5@M%n4+A&7;#+=EO5k&cj!&RtHK9pNKh`1l~6Qb;Ah; zhM0LckG9t&=$s#1l4;$Xf%9Z#1jN*I)FBzoOjqz3PDH!rYDR{A>ET z0rHpE!#~@wbMb-Y{66h`GhhA81EW3&t)AXoG~77Qsh$7iqX#ofP7WM8|IWEmw9mY33;~jsD1AR{1iK2`JVO+TdDIyr`)lKuFQDxz{)J?9Meln+q%xdGmrr1 z2SQFXAMvze)CN73m6)mK^CAk8)fw9U35ez~leBc?P~OPtFQ`3{xHZ#Z+9T69qotv2#ZUGNka6ZjPqt&SqDe3u(c%aK;?r7;jFc>s;+aro za%D643p!j#UP{OrM90TUYCB^7`GOwJ9BsxP)N#bj+(^$e{uxyI5SQs+Y@ti&E!s^q zt=E1-YpKmUXuNhitrC*IZXthj^UBg0$h@5%%_FOJ2bcc~JoRIqZl?>WE1>W#Jn^HV|i&L)rz2@jHn z`-Trx$$dg2y;Y%+J|roax}EebYq{LVL&Dw^@&IoF6$6?5yXb}FUmo!LN=TUdTaX|U4AWdgtZRp|5 e(#P<@H@FE4$k%%zeD#$u!o9RuFWyVH(EkPGV!Av4 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java index 107866d4..1602e268 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java @@ -125,19 +125,18 @@ public class RegionServiceImpl implements RegionService { /** * label,value */ -// JSONArray res = new JSONArray(); -// String point_status_explain = findByCode(region_id).getPoint_status_explain(); -// if (ObjectUtil.isEmpty(point_status_explain)) return res; -// String[] explain = point_status_explain.split(","); -// for (int i = 0; i < explain.length; i++) { -// String[] status = explain[i].split("-"); -// JSONObject point_status = new JSONObject(); -// point_status.put("label", status[1]); -// point_status.put("value", status[0]); -// res.add(point_status); -// } -// return res; - return null; + JSONArray res = new JSONArray(); + String point_status_explain = findByCode(region_code).getPoint_status_explain(); + if (ObjectUtil.isEmpty(point_status_explain)) return res; + String[] explain = point_status_explain.split(","); + for (int i = 0; i < explain.length; i++) { + String[] status = explain[i].split("-"); + JSONObject point_status = new JSONObject(); + point_status.put("label", status[1]); + point_status.put("value", status[0]); + res.add(point_status); + } + return res; } /** @@ -151,19 +150,18 @@ public class RegionServiceImpl implements RegionService { /** * label,value */ -// JSONArray res = new JSONArray(); -// String point_type_explain = findById(region_id).getPoint_type_explain(); -// if (ObjectUtil.isEmpty(point_type_explain)) return res; -// String[] explain = point_type_explain.split(","); -// for (int i = 0; i < explain.length; i++) { -// String[] types = explain[i].split("-"); -// JSONObject point_type = new JSONObject(); -// point_type.put("label", types[1]); -// point_type.put("value", types[0]); -// res.add(point_type); -// } -// return res; - return null; + JSONArray res = new JSONArray(); + String point_type_explain = findByCode(region_code).getPoint_type_explain(); + if (ObjectUtil.isEmpty(point_type_explain)) return res; + String[] explain = point_type_explain.split(","); + for (int i = 0; i < explain.length; i++) { + String[] types = explain[i].split("-"); + JSONObject point_type = new JSONObject(); + point_type.put("label", types[1]); + point_type.put("value", types[0]); + res.add(point_type); + } + return res; } } diff --git a/mes/qd/src/views/wms/pdm/device/index.vue b/mes/qd/src/views/wms/pdm/device/index.vue index cc3dd46f..d60641d2 100644 --- a/mes/qd/src/views/wms/pdm/device/index.vue +++ b/mes/qd/src/views/wms/pdm/device/index.vue @@ -117,16 +117,16 @@ - + - - - - - - - + + + + + + +