opt:富佳项目优化

nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java

@@ -26,6 +26,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
         String is_connect_erp = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.IS_CONNECT_ERP).getValue();
         if(is_connect_erp.equals("1")){
             try {
+                log.info("instorinfoToErp接口地址------------" +url);
                 String resultMsg = HttpRequest.post(url)
                         .body(String.valueOf(whereJson))
                         .execute().body();
@@ -35,7 +36,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
 
 
                 String status = result.getString("status");
-                if (!EXTConstant.ERROR.equals(status)) {
+                if (EXTConstant.ERROR.equals(status)) {
                     throw new BadRequestException(result.getString("message"));
                 }
 

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml

@@ -119,6 +119,7 @@
         pm_form_data
         left join md_me_materialbase on pm_form_data.material_code = md_me_materialbase.material_code
         <where>
+             (is_merge = 0 or is_merge is null)
             <if test="query.search != null and query.search != ''">
                 and form_data LIKE '%${query.search}%'
             </if>

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java

@@ -137,7 +137,7 @@ public class RetrunServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
                     for (IOStorInvDis disDao : iosDisList) {
                         JSONObject param = new JSONObject();
                         // 载具编码
-                        param.put("pallet_sn", disDao.getStoragevehicle_code());
+                        param.put("pallet_sn", mst.getVehicle_code());
                         param.put("instor_time", mst.getConfirm_time());
                         param.put("barcode", mst.getBarcode());
                         wmsToErpService.instorinfoToErp(param);