从源更新

src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java

@@ -21,8 +21,8 @@ public class FunctionsComponent implements ICommonQuery {
     private FunctionsService functionsService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return functionsService.getFunctions(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java

@@ -19,8 +19,8 @@ public class InOutItemComponent implements ICommonQuery {
     private InOutItemService inOutItemService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return inOutItemService.getInOutItem(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/log/LogComponent.java

@@ -19,8 +19,8 @@ public class LogComponent implements ICommonQuery {
     private LogService logService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return logService.getLog(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/material/MaterialComponent.java

@@ -21,8 +21,8 @@ public class MaterialComponent implements ICommonQuery {
     private MaterialService materialService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return materialService.getMaterial(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java

@@ -21,8 +21,8 @@ public class MaterialCategoryComponent implements ICommonQuery {
     private MaterialCategoryService materialCategoryService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return materialCategoryService.getMaterialCategory(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java

@@ -19,8 +19,8 @@ public class MaterialPropertyComponent implements ICommonQuery {
     private MaterialPropertyService materialPropertyService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return materialPropertyService.getMaterialProperty(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java

@@ -21,9 +21,10 @@ import java.util.Map;
 public class OrgaUserRelComponent implements ICommonQuery {
     @Resource
     private OrgaUserRelService orgaUserRelService;
+
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return orgaUserRelService.getOrgaUserRel(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java

@@ -41,6 +41,11 @@ public class OrgaUserRelService {
     private UserService userService;
     @Resource
     private LogService logService;
+
+    public OrgaUserRel getOrgaUserRel(long id) throws Exception{
+        return orgaUserRelMapper.selectByPrimaryKey(id);
+    }
+
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int insertOrgaUserRel(String beanJson, HttpServletRequest request) throws Exception{
         OrgaUserRel orgaUserRel = JSONObject.parseObject(beanJson, OrgaUserRel.class);

src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java

@@ -22,9 +22,10 @@ import java.util.Map;
 public class OrganizationComponent implements ICommonQuery {
     @Resource
     private OrganizationService organizationService;
+
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return organizationService.getOrganization(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/organization/OrganizationService.java

@@ -44,6 +44,11 @@ public class OrganizationService {
     private UserService userService;
     @Resource
     private LogService logService;
+
+    public Organization getOrganization(long id) throws Exception {
+        return organizationMapper.selectByPrimaryKey(id);
+    }
+
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int insertOrganization(String beanJson, HttpServletRequest request)throws Exception {
         Organization organization = JSONObject.parseObject(beanJson, Organization.class);

src/main/java/com/jsh/erp/service/person/PersonComponent.java

@@ -21,8 +21,8 @@ public class PersonComponent implements ICommonQuery {
     private PersonService personService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return personService.getPerson(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/role/RoleComponent.java

@@ -19,8 +19,8 @@ public class RoleComponent implements ICommonQuery {
     private RoleService roleService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return roleService.getRole(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java

@@ -26,8 +26,8 @@ public class SerialNumberComponent implements ICommonQuery {
     private SerialNumberService serialNumberService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return serialNumberService.getSerialNumber(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java

@@ -21,8 +21,8 @@ public class SupplierComponent implements ICommonQuery {
     private SupplierService supplierService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return supplierService.getSupplier(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java

@@ -21,8 +21,8 @@ public class SystemConfigComponent implements ICommonQuery {
     private SystemConfigService systemConfigService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return systemConfigService.getSystemConfig(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/unit/UnitComponent.java

@@ -20,8 +20,8 @@ public class UnitComponent implements ICommonQuery {
     private UnitService unitService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return unitService.getUnit(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/user/UserComponent.java

@@ -18,8 +18,8 @@ public class UserComponent implements ICommonQuery {
     private UserService userService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return userService.getUser(id);
     }
 
     @Override

src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java

@@ -22,8 +22,8 @@ public class UserBusinessComponent implements ICommonQuery {
     private UserBusinessService userBusinessService;
 
     @Override
-    public Object selectOne(String condition)throws Exception {
-        return null;
+    public Object selectOne(Long id) throws Exception {
+        return userBusinessService.getUserBusiness(id);
     }
 
     @Override

src/main/resources/mapper_xml/DepotHeadMapperEx.xml

@@ -60,12 +60,6 @@
             <bind name="number" value="'%' + _parameter.number + '%'"/>
             and dh.Number like #{number}
         </if>
-        <if test="dhIds != null and dhIds != ''">
-            and dh.Id in
-            <foreach item="dhId" index="index" collection="dhIds.split(',')"  open="(" separator="," close=")">
-                #{dhId}
-            </foreach>
-        </if>
         <if test="beginTime != null and beginTime != ''">
             and dh.OperTime >= #{beginTime}
         </if>
@@ -93,19 +87,19 @@
             <bind name="number" value="'%' + _parameter.number + '%'"/>
             and Number like #{number}
         </if>
-        <if test="dhIds != null and dhIds != ''">
-            and Id in
-            <foreach item="dhId" index="index" collection="dhIds.split(',')"  open="(" separator="," close=")">
-                #{dhId}
-            </foreach>
-        </if>
         <if test="beginTime != null and beginTime != ''">
             and OperTime >= #{beginTime}
         </if>
         <if test="endTime != null and endTime != ''">
             and OperTime &lt;= #{endTime}
         </if>
-        and ifnull(delete_Flag,'0') !='1'
+        <if test="materialParam != null">
+            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        </if>
+        <if test="depotIds != null">
+            and di.DepotId in (${depotIds})
+        </if>
+        and ifnull(jsh_depothead.delete_Flag,'0') !='1'
     </select>
 
 

src/main/resources/mapper_xml/DepotItemMapperEx.xml

@@ -2,16 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper  namespace="com.jsh.erp.datasource.mappers.DepotItemMapperEx">
 
-    <resultMap id="HeaderIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4HeaderId">
-        <result column="HeaderId" jdbcType="BIGINT" property="headerid" />
-    </resultMap>
-
     <resultMap id="DetailByTypeAndMIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4DetailByTypeAndMId">
         <result column="Number" jdbcType="VARCHAR" property="number" />
         <result column="newType" jdbcType="VARCHAR" property="newtype" />
         <result column="b_num" jdbcType="BIGINT" property="bnum" />
         <result column="oTime" jdbcType="TIMESTAMP" property="otime" />
     </resultMap>
+    <resultMap id="HeaderIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4HeaderId">
+        <result column="HeaderId" jdbcType="BIGINT" property="headerid" />
+    </resultMap>
 
     <resultMap extends="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap" id="ResultAndMaterialMap" type="com.jsh.erp.datasource.entities.DepotItemVo4Material">
         <result column="mName" jdbcType="VARCHAR" property="mname" />