智业相关修改

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -1279,7 +1279,7 @@ public class CtqyyClient extends CommonHttpClient {
                                 code = code.substring(1, code.length() - 1);
                             }
                             itemDTO.setCode(code);
-                            itemDTO.setNameCode(codeDetaiEntity.getNameCode());
+                            itemDTO.setNameCode(code.substring(0, 16));
 
                             if (IntUtil.value(codeDetaiEntity.getCount()) > 1) {
                                 for (int i = 0; i < codeDetaiEntity.getCount(); i++) {

src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java

@@ -388,9 +388,9 @@ public class ZaxyyClient extends CommonHttpClient {
             return submitOrder(orderEntity, zaZyRequest);
         } else if (thrSystemBusApiEntity.getUrl().equals("saveMaterialHight")) {
 //            1.先提交到物资；
-            zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+//            zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
-            zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
+//            zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
-            submitOrder(orderEntity, zaZyRequest);
+//            submitOrder(orderEntity, zaZyRequest);
 //          2.提交到预备货
             zaxzyyOrderRequest.setLocStorageCode("1001304");
             zaxzyyOrderRequest.setLocStorageName("骨科耗材及试剂仓库");
@@ -654,7 +654,13 @@ public class ZaxyyClient extends CommonHttpClient {
                         for (UdiwmsOrderDetailRequest.CodeDetailEntity codeDetaiEntity : udiwmsOrderDetail.getCodeList()) {
                             UdiwmsPreInOrderRequest.ItemDTO itemDTO = new UdiwmsPreInOrderRequest.ItemDTO();
                             BeanUtils.copyProperties(udiwmsOrderDetail, itemDTO);
-                            itemDTO.setCode(codeDetaiEntity.getCode());
+                            String code = codeDetaiEntity.getCode();
+                            if (code.contains("\u001D")) {
+//                                code = code.replace("\u001D", "zysoft");  智业无法识别GS1符号
+                                code = code.replace("\u001D", "");
+                            }
+                            itemDTO.setCode(code);
+                            itemDTO.setNameCode(code.substring(0, 16));
                             itemDTO.setCount(codeDetaiEntity.getCount());
                             itemDTOS.add(itemDTO);