Merge remote-tracking branch 'origin/dev_huangjunjie'

docs/new_sql.sql

@@ -157,7 +157,6 @@ ALTER TABLE jsh_material_extend
   MODIFY commodity_decimal DECIMAL(24,2) DEFAULT NULL COMMENT '零售价格',
   MODIFY wholesale_decimal DECIMAL(24,2) DEFAULT NULL COMMENT '销售价格',
   MODIFY low_decimal DECIMAL(24,2) DEFAULT NULL COMMENT '最低售价',
-  MODIFY inventory DECIMAL(10,0) DEFAULT 0 COMMENT 'inventory';
   MODIFY inventory DECIMAL(10,0) DEFAULT 0 COMMENT '库存';
 
 -- 初始库存表 修改库存类型
@@ -184,7 +183,7 @@ ALTER TABLE jsh_depot_item
 
 -- 商品子表 新增单位比例
 ALTER TABLE jsh_material_extend
-  ADD COLUMN ratio INT DEFAULT NULL COMMENT '单位比例';
+  ADD COLUMN ratio INT DEFAULT 1 COMMENT '单位比例';
 
 -- 初始库存表 新增仓位货架
 ALTER TABLE jsh_material_initial_stock

src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -129,8 +129,7 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
      */
     @Override
     public PDAPrintVo pdaPrintMaterial(Long depotItemId) {
-        materialMapperEx.pdaPrintMaterial(depotItemId);
-        return null;
+        return materialMapperEx.pdaPrintMaterial(depotItemId);
     }
 
     @Override

src/main/java/com/jsh/erp/service/impl/MaterialServiceImpl.java

@@ -187,7 +187,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         m.setEnabled(true);
         //获取类型编码
         Long serial_no = materialCategoryService.getMaterialCategory(m.getCategoryId()).getSerialNo();
-        String sku = serial_no + DateUtils.dateTimeNow()  + RandomHelper.getRandomStr(4);
+        String sku = serial_no + DateUtils.dateTimeNow()  + RandomHelper.getRandomStr(6);
         //设置系统sku
         m.setSystemSku(sku);
         User user = userService.getCurrentUser();
@@ -1708,7 +1708,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
             String fileName = file.getOriginalFilename();
             if(StringUtil.isNotEmpty(fileName)) {
                 String fileExt = fileName.substring(fileName.indexOf(".")+1);
-                if(!"xls".equals(fileExt)) {
+                if(!"xls".equals(fileExt) && !"xlsx".equals(fileExt)) {
                     throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_EXTENSION_ERROR_CODE,
                             ExceptionConstants.MATERIAL_EXTENSION_ERROR_MSG);
                 }
@@ -1833,7 +1833,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
                 //设置单位、备注、基础重量
                 m.setUnit(unit);
                 m.setRemark(remark);
-                m.setWeight(new BigDecimal(weight));
+                m.setWeight(weight.isEmpty()  ? null : new BigDecimal(weight));
                 //设置商品是否启用
                 m.setEnabled("1".equals(enabled));
                 //设置商品是否开启序列号
@@ -1845,7 +1845,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
                 //获取类型编码
                 Long serial_no = categoryId == null ? null : materialCategoryService.getMaterialCategory(m.getCategoryId()).getSerialNo();
                 //设置系统sku
-                m.setSystemSku(serial_no + DateUtils.dateTimeNow() + RandomHelper.getRandomStr(4));
+                m.setSystemSku(serial_no + DateUtils.dateTimeNow() + RandomHelper.getRandomStr(6));
                 m.setOtherField1(StringUtil.isNotEmpty(otherField1)?otherField1:null);
                 m.setOtherField2(StringUtil.isNotEmpty(otherField2)?otherField2:null);
                 m.setOtherField3(StringUtil.isNotEmpty(otherField3)?otherField3:null);