从源更新

src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java

@@ -10,6 +10,8 @@ public class MaterialVo4Unit extends Material{
 
     private String materialOther;
 
+    private Long stock;
+
     public String getUnitName() {
         return unitName;
     }
@@ -33,4 +35,12 @@ public class MaterialVo4Unit extends Material{
     public void setMaterialOther(String materialOther) {
         this.materialOther = materialOther;
     }
+
+    public Long getStock() {
+        return stock;
+    }
+
+    public void setStock(Long stock) {
+        this.stock = stock;
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/AssetCategoryMapper.java

-package com.jsh.erp.datasource.mappers;
-
-import com.jsh.erp.datasource.entities.AssetCategory;
-import com.jsh.erp.datasource.entities.AssetCategoryExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface AssetCategoryMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    int countByExample(AssetCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    int deleteByExample(AssetCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    int insert(AssetCategory record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    int insertSelective(AssetCategory record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    List<AssetCategory> selectByExample(AssetCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    AssetCategory selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    int updateByExampleSelective(@Param("record") AssetCategory record, @Param("example") AssetCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    int updateByExample(@Param("record") AssetCategory record, @Param("example") AssetCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    int updateByPrimaryKeySelective(AssetCategory record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_assetcategory
-     *
-     * @mbggenerated
-     */
-    int updateByPrimaryKey(AssetCategory record);
-}
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/AssetMapper.java

-package com.jsh.erp.datasource.mappers;
-
-import com.jsh.erp.datasource.entities.Asset;
-import com.jsh.erp.datasource.entities.AssetExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface AssetMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int countByExample(AssetExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int deleteByExample(AssetExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int insert(Asset record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int insertSelective(Asset record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    List<Asset> selectByExampleWithBLOBs(AssetExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    List<Asset> selectByExample(AssetExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    Asset selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int updateByExampleSelective(@Param("record") Asset record, @Param("example") AssetExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int updateByExampleWithBLOBs(@Param("record") Asset record, @Param("example") AssetExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int updateByExample(@Param("record") Asset record, @Param("example") AssetExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int updateByPrimaryKeySelective(Asset record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int updateByPrimaryKeyWithBLOBs(Asset record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_asset
-     *
-     * @mbggenerated
-     */
-    int updateByPrimaryKey(Asset record);
-}
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java

@@ -110,10 +110,11 @@ public interface DepotHeadMapperEx {
      * */
     void updatedepotHead(DepotHead depotHead);
 
+    void updateBuildOnlyNumber();
     /**
      * 获得一个全局唯一的数作为订单号的追加
      * */
-     Long  getBuildOnlyNumber(@Param("seq_name") String seq_name);
+    Long getBuildOnlyNumber(@Param("seq_name") String seq_name);
 
     int batchDeleteDepotHeadByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 

src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -45,10 +45,10 @@ public interface DepotItemMapperEx {
             @Param("mId") Long mId,
             @Param("monthTime") String monthTime);
 
-    int findByTypeAndMaterialIdIn(
+    Long findByTypeAndMaterialIdIn(
             @Param("mId") Long mId);
 
-    int findByTypeAndMaterialIdOut(
+    Long findByTypeAndMaterialIdOut(
             @Param("mId") Long mId);
 
     int findByTypeAndDepotIdAndMaterialIdIn(

src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java

@@ -20,7 +20,6 @@ public interface MaterialMapperEx {
     List<MaterialVo4Unit> selectByConditionMaterial(
             @Param("name") String name,
             @Param("model") String model,
-            @Param("categoryId") Long categoryId,
             @Param("categoryIds") String categoryIds,
             @Param("mpList") String mpList,
             @Param("offset") Integer offset,
@@ -29,7 +28,6 @@ public interface MaterialMapperEx {
     Long countsByMaterial(
             @Param("name") String name,
             @Param("model") String model,
-            @Param("categoryId") Long categoryId,
             @Param("categoryIds") String categoryIds,
             @Param("mpList") String mpList);
 
@@ -46,7 +44,6 @@ public interface MaterialMapperEx {
     List<MaterialVo4Unit> findByAll(
             @Param("name") String name,
             @Param("model") String model,
-            @Param("categoryId") Long categoryId,
             @Param("categoryIds") String categoryIds);
     /**
      * 通过商品名称查询商品信息

src/main/java/com/jsh/erp/service/ResourceInfo.java

@@ -24,6 +24,10 @@ import java.lang.annotation.*;
  * depotItem-90
  * accountHead-95
  * accountItem-100
+ * serialNumber-105
+ * organization-110
+ * orgaUserRel-115
+ * tenant-120
  */
 @Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)

src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java

@@ -291,8 +291,8 @@ public class DepotItemService {
         return depotItemMapper.updateByPrimaryKeySelective(depotItem);
     }
 
-    public int findByTypeAndMaterialId(String type, Long mId) throws Exception{
-        int result =0;
+    public Long findByTypeAndMaterialId(String type, Long mId) throws Exception{
+        Long result = 0l;
         try{
             if(type.equals(TYPE)) {
                 result= depotItemMapperEx.findByTypeAndMaterialIdIn(mId);