工艺相关Bug修复20240717-打包提交

dist/asset-manifest.json

@@ -1,6 +1,6 @@
 {
   "/umi.css": "/umi.2d7db433.css",
-  "/umi.js": "/umi.212ebdc6.js",
+  "/umi.js": "/umi.3e235fbc.js",
   "/t__plugin-layout__Layout.css": "/t__plugin-layout__Layout.e1129705.chunk.css",
   "/t__plugin-layout__Layout.js": "/t__plugin-layout__Layout.87f875be.async.js",
   "/p__user__login.css": "/p__user__login.2f84d6a8.chunk.css",
@@ -21,11 +21,11 @@
   "/p__database__goods__goodstypemanage.js": "/p__database__goods__goodstypemanage.2d08d4c1.async.js",
   "/p__database__goods__goodsattribute.js": "/p__database__goods__goodsattribute.4738ebf1.async.js",
   "/p__database__goods__newgoods.css": "/p__database__goods__newgoods.648d67d4.chunk.css",
-  "/p__database__goods__newgoods.js": "/p__database__goods__newgoods.b5061571.async.js",
+  "/p__database__goods__newgoods.js": "/p__database__goods__newgoods.80cf7703.async.js",
   "/p__database__goods__goodsInfo.js": "/p__database__goods__goodsInfo.be92d1bf.async.js",
   "/p__database__goods__goodsbom.js": "/p__database__goods__goodsbom.0e79a659.async.js",
   "/p__database__goods__goodstechnology.css": "/p__database__goods__goodstechnology.bee21a79.chunk.css",
-  "/p__database__goods__goodstechnology.js": "/p__database__goods__goodstechnology.a28551c7.async.js",
+  "/p__database__goods__goodstechnology.js": "/p__database__goods__goodstechnology.10cd446f.async.js",
   "/p__database__goods__goodsattributeprice.css": "/p__database__goods__goodsattributeprice.fffb33ff.chunk.css",
   "/p__database__goods__goodsattributeprice.js": "/p__database__goods__goodsattributeprice.4fb90d88.async.js",
   "/p__device__product.js": "/p__device__product.5091f037.async.js",

dist/authorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/authorization/platformAuthorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/authorization/storeAuthorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/company/account/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/company/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/basic/batching/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/bom/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/goods/goodsInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/goods/goodsattribute/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/goods/goodsattributeprice/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/goods/goodsbom/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/goods/goodstechnology/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/goods/goodstypemanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/goods/newgoods/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/database/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/device/deviceInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/device/deviceVesion/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/device/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/device/product/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/device/productmanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/device/technology/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/device/warehousepostion/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/order/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/order/orderflow/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/order/thirdAuthorize/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/order/thirdOrder/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/org/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/org/orgamange/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/org/roles/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/org/users/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/push/batchingpush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/push/bompush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/push/goodspush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/push/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/push/technologypush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/scene/foodmenu/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/scene/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/scene/store/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/sys/dictionary/dicttype/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/sys/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/sys/menus/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/user/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/user/login/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

dist/welcome/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.212ebdc6.js"></script>
+    <script src="/umi.3e235fbc.js"></script>
   </body>
 </html>

src/pages/database/goods/goodstechnology/components/EditFrom.jsx

@@ -45,6 +45,7 @@ const EditFrom = (props) => {
             }
             data.push({ index: index + 1, id: '', stepName: '', chnologyId: '', actionJson: '', sort: so, goodsId: '', goodsAttributeId: '', optiondata: [], propsdata: [], isBatch: true, typeName: '', disabled: false })
             setfromdata(data)
+            props.ontechnologyChange(data)
             props.onUpdataStatus("add")
         }
     }
@@ -97,6 +98,7 @@ const EditFrom = (props) => {
             return x
         })
         setfromdata(newdata)
+        props.ontechnologyChange(newdata)
         console.log("from", newdata)
     }
     //保存

src/pages/database/goods/goodstechnology/components/goodstechnologymaken.jsx

@@ -370,6 +370,9 @@ const goodstechnologymaken = (props) => {
   const onSaveClick = (val) => {
     setfromdata(val)
   }
+  const ontechnologyChange = (val) => {
+    setfromdata(val)
+  }
   const onSubmitSaveClick = () => {
     let check = true;
     var data = []
@@ -398,6 +401,12 @@ const goodstechnologymaken = (props) => {
           if (df.actionType == "digit" && (f.actionValue === '' || f.actionValue === null)) {
             check = false;
           }
+          if (df.actionType == "text" && (f.actionValue === '' || f.actionValue === null)) {
+            check = false;
+          }
+          if (df.actionType == "textarea" && (f.actionValue === '' || f.actionValue === null)) {
+            check = false;
+          }
         } else {
           if (f.actionValue === '') {
             check = false;
@@ -718,6 +727,7 @@ const goodstechnologymaken = (props) => {
             maxsort={maxsort}
             UpdataStatus={UpdataStatus}
             onUpdataStatus={onUpdataStatus}
+            ontechnologyChange={ontechnologyChange}
             onSaveClick={onSaveClick}
             goodstechnologydata={goodstechnologydata}
             technologyattralldata={technologyattralldata}

src/pages/database/goods/newgoods/index.jsx

@@ -431,6 +431,11 @@ const GoodsManage = () => {
       message.error('请选择一个设备！');
       return;
     }
+    if(goodsId == '')
+    {
+      message.error('请选择至少一个商品！');
+      return;
+    }
     const base64String = await GoodsSimpleExport({ goodsId: goodsId, deviceId: deviceId, ids: ids });
       // 解码 Base64 数据
       const binaryString = atob(base64String);