20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入

黎星凯

2024-05-13 58a518f8bc23ed382f4da2a86b09024b063a620c

20240511修改:
分发单优化，
分类，物品，分发单明细，采购单明细数据导入

 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java

@@ -455,6 +455,9 @@
                            if (StrUtil.isEmpty(goodsType)) {
                                throw new ExcelAnalysisException("第" + index + "条数据，物品类型不能为空：" + goodsType);
                            }
                            if(!"自采".equals(goodsType) && !"集采".equals(goodsType)){
                                throw new ExcelAnalysisException("第" + index + "条数据，物品类型取值为[自采/集采] æ•°æ®æºå€¼ä¸ºï¼š" + goodsType);
                            }

                            // ç¬¬ä¸€æ¬¡è¿›æ¥æŠŠå¤–层的值设置一下
                            if (lWhFormProcureParam.getAgencyId() == null) {

 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java

@@ -783,8 +783,8 @@
                            }
                            // ä½¿ç”¨äºº
                            String user = data.getUser();
                            if (StrUtil.isEmpty(user)) {
                                throw new ExcelAnalysisException("第" + index + "条数据，使用人不能为空：" + user);
                            if (StrUtil.isEmpty(user) && type.equals("A")) {
                                throw new ExcelAnalysisException("第" + index + "条数据，管理分类为A的物品，使用人不能为空：" + user);
                            }
                            // è”系电话
                            String userContactPhone = data.getUserContactPhone();

 deploy-jar-single/src/main/resources/import/·Ö·¢µ¼Èë.xls

Binary files differ

 deploy-jar-single/src/main/resources/import/ÎïÆ·ÐÅÏ¢.xls

Binary files differ

 deploy-jar-single/src/main/resources/import/²É¹ºµ¼Èë.xls

Binary files differ