Merge branch 'dev-1.1.4' into 'dev-1.1.4'

处理提交盘点报错

See merge request hurugang/thmz_system!12

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfInventoryServiceImpl.java

@@ -79,6 +79,11 @@ public class YfInventoryServiceImpl implements YfInventoryService {
             ypOutDetlYf.setOutSeri(i+1);
             ypOutDetlYf.setInSeri(0);
             ypOutDetlYf.setDrawNo(yfOutNo);
+
+            // 处理提交盘点报错
+            String code = ypOutDetlYf.getChargeCode()  == null ? "" : ypOutDetlYf.getChargeCode().replace(" ","");
+            ypOutDetlYf.setChargeCode(code);
+
             if(ypOutDetlYf.getGroupNo().equals("71")){
                 ypOutDetlYf.setDeptCode("2060400");
             }else{