Merge branch 'dev' of http://git.estsh.com/i3-WMS/i3plus-wms into dev

# Conflicts:
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsUnitController.java

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface WmsVendorPartRepository extends BaseRepository<WmsVendorPart, Long>{
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1941,4 +1941,20 @@ public class WmsHqlPack {
         return packBean;
     }
 
+    /**
+     * 单位定义
+     *
+     * @param wmsUnit
+     * @return
+     */
+    public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result);
+        DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);
+        getStringBuilderPack(wmsUnit, result);
+
+        return result;
+    }
 }