系统功能细节优化

docs/数据库更新记录-方便升级.txt

@@ -732,4 +732,12 @@ ROW_FORMAT=COMPACT
 -- 时间 2020-02-16
 -- by jishenghua
 -- ----------------------------
-alter table jsh_depotitem add material_extend_id bigint(20) DEFAULT NULL COMMENT '商品扩展id' after MaterialId;
+alter table jsh_depotitem add material_extend_id bigint(20) DEFAULT NULL COMMENT '商品扩展id' after MaterialId;
+
+-- ----------------------------
+-- 给单据主表删除字段ProjectId 和 AllocationProjectId
+-- 时间 2020-02-18
+-- by jishenghua
+-- ----------------------------
+alter table jsh_depothead drop column ProjectId
+alter table jsh_depothead drop column AllocationProjectId

erp_web/js/pages/materials/in_out.js

@@ -21,7 +21,6 @@
 	var orgDefaultList; //存储查询出来的会员列表
 	var accountList; //账户列表
 	var outItemList; //支出项目列表
-	var thisTaxRate = 0; //当前税率，选择供应商或者客户的时候设置
 	var oldNumber = ""; //编辑前的单据编号
 	var oldId = 0; //编辑前的单据Id
 	var otherColumns = true; //明细中的‘别名’列是否显示
@@ -248,26 +247,6 @@
 					}
 					$("#payType").empty().append(option);
 				}
-				else{
-					$.ajax({
-						type:"get",
-						url: "/supplier/findById",
-						data: {
-                            supplierId: rec.id
-						},
-						dataType: "json",
-						success: function (res){
-							if(res && res.code === 200) {
-                                if(res.data && res.data[0]){
-                                    thisTaxRate = res.data[0].taxRate; //设置当前的税率
-                                }
-							}
-						},
-						error:function(){
-
-						}
-					});
-				}
 			}
 		});
 	}
@@ -1465,6 +1444,8 @@
 
 			$("#AccountId").attr("data-accountArr", JSON.stringify(accountArr)).attr("data-accountMoneyArr", JSON.stringify(accountMoneyArr));  //json数据存储
 			$(".many-account-ico").show(); //显示多账户的ico图标
+		} else {
+			$(".many-account-ico").hide(); //隐藏多账户的ico图标
 		}
 
 		//采购入库、销售出库的费用数据加载
@@ -2397,15 +2378,8 @@
 				body.find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
 				statisticsFun(body,UnitPrice,OperNumber,footer,taxRate);
 			});
-
+			//默认税率为0
-			//加载税率
+			body.find("[field='TaxRate']").find(input).val(0);
-			if(thisTaxRate) {
-				body.find("[field='TaxRate']").find(input).val(thisTaxRate);
-			}
-			else {
-				body.find("[field='TaxRate']").find(input).val(0); //默认为0
-			}
-
 			//在商品类型加载 组装件、普通子件
 			var mType = body.find("[field='MType']");
 			var rowListLength = mType.find(input).closest(".datagrid-row").attr("datagrid-row-index");

erp_web/pages/reports/buy_in_report.html

@@ -101,7 +101,7 @@
             pageSize: 10,
             pageList: [10, 50, 100],
             columns: [[
-                {title: '名称', field: 'MaterialName', width: 60},
+                {title: '名称', field: 'MaterialName', width: 160},
                 {title: '型号', field: 'MaterialModel', width: 80},
                 {title: '扩展信息', field: 'MaterialOther', width: 150},
                 {title: '单位', field: 'MaterialUnit', width: 80,

erp_web/pages/reports/sale_out_report.html

@@ -104,7 +104,7 @@
             pageSize: 10,
             pageList: [10, 50, 100],
             columns: [[
-                {title: '名称', field: 'MaterialName', width: 60},
+                {title: '名称', field: 'MaterialName', width: 160},
                 {title: '型号', field: 'MaterialModel', width: 80},
                 {title: '扩展信息', field: 'MaterialOther', width: 150},
                 {title: '单位', field: 'MaterialUnit', width: 80,

erp_web/pages/reports/stock_warning_report.html

@@ -203,7 +203,7 @@
             pageSize: 10,
             pageList: [10, 50, 100],
             columns: [[
-                {title: '名称', field: 'materialName', width: 60},
+                {title: '名称', field: 'materialName', width: 160},
                 {title: '型号', field: 'materialModel', width: 80},
                 {title: '扩展信息', field: 'materialOther', width: 150},
                 {title: '单位', field: 'materialUnit', width: 80},

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

@@ -10,8 +10,6 @@ public class DepotHead {
 
     private String subtype;
 
-    private Long projectid;
-
     private String defaultnumber;
 
     private String number;
@@ -30,8 +28,6 @@ public class DepotHead {
 
     private BigDecimal changeamount;
 
-    private Long allocationprojectid;
-
     private BigDecimal totalprice;
 
     private String paytype;
@@ -90,14 +86,6 @@ public class DepotHead {
         this.subtype = subtype == null ? null : subtype.trim();
     }
 
-    public Long getProjectid() {
-        return projectid;
-    }
-
-    public void setProjectid(Long projectid) {
-        this.projectid = projectid;
-    }
-
     public String getDefaultnumber() {
         return defaultnumber;
     }
@@ -170,14 +158,6 @@ public class DepotHead {
         this.changeamount = changeamount;
     }
 
-    public Long getAllocationprojectid() {
-        return allocationprojectid;
-    }
-
-    public void setAllocationprojectid(Long allocationprojectid) {
-        this.allocationprojectid = allocationprojectid;
-    }
-
     public BigDecimal getTotalprice() {
         return totalprice;
     }

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

@@ -306,66 +306,6 @@ public class DepotHeadExample {
             return (Criteria) this;
         }
 
-        public Criteria andProjectidIsNull() {
-            addCriterion("ProjectId is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidIsNotNull() {
-            addCriterion("ProjectId is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidEqualTo(Long value) {
-            addCriterion("ProjectId =", value, "projectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidNotEqualTo(Long value) {
-            addCriterion("ProjectId <>", value, "projectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidGreaterThan(Long value) {
-            addCriterion("ProjectId >", value, "projectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidGreaterThanOrEqualTo(Long value) {
-            addCriterion("ProjectId >=", value, "projectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidLessThan(Long value) {
-            addCriterion("ProjectId <", value, "projectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidLessThanOrEqualTo(Long value) {
-            addCriterion("ProjectId <=", value, "projectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidIn(List<Long> values) {
-            addCriterion("ProjectId in", values, "projectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidNotIn(List<Long> values) {
-            addCriterion("ProjectId not in", values, "projectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidBetween(Long value1, Long value2) {
-            addCriterion("ProjectId between", value1, value2, "projectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectidNotBetween(Long value1, Long value2) {
-            addCriterion("ProjectId not between", value1, value2, "projectid");
-            return (Criteria) this;
-        }
-
         public Criteria andDefaultnumberIsNull() {
             addCriterion("DefaultNumber is null");
             return (Criteria) this;
@@ -936,66 +876,6 @@ public class DepotHeadExample {
             return (Criteria) this;
         }
 
-        public Criteria andAllocationprojectidIsNull() {
-            addCriterion("AllocationProjectId is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidIsNotNull() {
-            addCriterion("AllocationProjectId is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidEqualTo(Long value) {
-            addCriterion("AllocationProjectId =", value, "allocationprojectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidNotEqualTo(Long value) {
-            addCriterion("AllocationProjectId <>", value, "allocationprojectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidGreaterThan(Long value) {
-            addCriterion("AllocationProjectId >", value, "allocationprojectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidGreaterThanOrEqualTo(Long value) {
-            addCriterion("AllocationProjectId >=", value, "allocationprojectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidLessThan(Long value) {
-            addCriterion("AllocationProjectId <", value, "allocationprojectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidLessThanOrEqualTo(Long value) {
-            addCriterion("AllocationProjectId <=", value, "allocationprojectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidIn(List<Long> values) {
-            addCriterion("AllocationProjectId in", values, "allocationprojectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidNotIn(List<Long> values) {
-            addCriterion("AllocationProjectId not in", values, "allocationprojectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidBetween(Long value1, Long value2) {
-            addCriterion("AllocationProjectId between", value1, value2, "allocationprojectid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAllocationprojectidNotBetween(Long value1, Long value2) {
-            addCriterion("AllocationProjectId not between", value1, value2, "allocationprojectid");
-            return (Criteria) this;
-        }
-
         public Criteria andTotalpriceIsNull() {
             addCriterion("TotalPrice is null");
             return (Criteria) this;

src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java

@@ -94,6 +94,14 @@ public class DepotHeadService {
         }
         if (null != list) {
             for (DepotHeadVo4List dh : list) {
+                if(dh.getAccountidlist() != null) {
+                    String accountidlistStr = dh.getAccountidlist().replace("[", "").replace("]", "").replaceAll("\"", "");
+                    dh.setAccountidlist(accountidlistStr);
+                }
+                if(dh.getAccountmoneylist() != null) {
+                    String accountmoneylistStr = dh.getAccountmoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
+                    dh.setAccountmoneylist(accountmoneylistStr);
+                }
                 if(dh.getOthermoneylist() != null) {
                     String otherMoneyListStr = dh.getOthermoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
                     dh.setOthermoneylist(otherMoneyListStr);
@@ -291,20 +299,6 @@ public class DepotHeadService {
         return list;
     }
 
-    public List<DepotHead> getDepotHeadGiftOut(String projectId)throws Exception {
-        DepotHeadExample example = new DepotHeadExample();
-        if (projectId != null) {
-            example.createCriteria().andProjectidEqualTo(Long.parseLong(projectId));
-        }
-        List<DepotHead> list = null;
-        try{
-            list =depotHeadMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
-
     public List<DepotHeadVo4InDetail> findByAll(String beginTime, String endTime, String type, Integer pid, String dids, Integer oId, Integer offset, Integer rows) throws Exception{
         List<DepotHeadVo4InDetail> list = null;
         try{

src/main/resources/mapper_xml/DepotHeadMapper.xml

@@ -5,7 +5,6 @@
     <id column="Id" jdbcType="BIGINT" property="id" />
     <result column="Type" jdbcType="VARCHAR" property="type" />
     <result column="SubType" jdbcType="VARCHAR" property="subtype" />
-    <result column="ProjectId" jdbcType="BIGINT" property="projectid" />
     <result column="DefaultNumber" jdbcType="VARCHAR" property="defaultnumber" />
     <result column="Number" jdbcType="VARCHAR" property="number" />
     <result column="OperPersonName" jdbcType="VARCHAR" property="operpersonname" />
@@ -15,7 +14,6 @@
     <result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
     <result column="AccountId" jdbcType="BIGINT" property="accountid" />
     <result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
-    <result column="AllocationProjectId" jdbcType="BIGINT" property="allocationprojectid" />
     <result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
     <result column="PayType" jdbcType="VARCHAR" property="paytype" />
     <result column="Remark" jdbcType="VARCHAR" property="remark" />
@@ -93,11 +91,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime, 
+    Id, Type, SubType, DefaultNumber, Number, OperPersonName, CreateTime, OperTime, OrganId, 
-    OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice, 
+    HandsPersonId, AccountId, ChangeAmount, TotalPrice, PayType, Remark, Salesman, AccountIdList, 
-    PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney, 
+    AccountMoneyList, Discount, DiscountMoney, DiscountLastMoney, OtherMoney, OtherMoneyList, 
-    DiscountLastMoney, OtherMoney, OtherMoneyList, OtherMoneyItem, AccountDay, Status, 
+    OtherMoneyItem, AccountDay, Status, LinkNumber, tenant_id, delete_Flag
-    LinkNumber, tenant_id, delete_Flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
     select
@@ -131,27 +128,25 @@
   </delete>
   <insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotHead">
     insert into jsh_depothead (Id, Type, SubType, 
-      ProjectId, DefaultNumber, Number, 
+      DefaultNumber, Number, OperPersonName, 
-      OperPersonName, CreateTime, OperTime, 
+      CreateTime, OperTime, OrganId, 
-      OrganId, HandsPersonId, AccountId, 
+      HandsPersonId, AccountId, ChangeAmount, 
-      ChangeAmount, AllocationProjectId, TotalPrice, 
+      TotalPrice, PayType, Remark, 
-      PayType, Remark, Salesman, 
+      Salesman, AccountIdList, AccountMoneyList, 
-      AccountIdList, AccountMoneyList, Discount, 
+      Discount, DiscountMoney, DiscountLastMoney, 
-      DiscountMoney, DiscountLastMoney, OtherMoney, 
+      OtherMoney, OtherMoneyList, OtherMoneyItem, 
-      OtherMoneyList, OtherMoneyItem, AccountDay, 
+      AccountDay, Status, LinkNumber, 
-      Status, LinkNumber, tenant_id, 
+      tenant_id, delete_Flag)
-      delete_Flag)
     values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, 
-      #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
+      #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{operpersonname,jdbcType=VARCHAR}, 
-      #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, 
+      #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, #{organid,jdbcType=BIGINT}, 
-      #{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, 
+      #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL}, 
-      #{changeamount,jdbcType=DECIMAL}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DECIMAL}, 
+      #{totalprice,jdbcType=DECIMAL}, #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
-      #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR}, 
+      #{salesman,jdbcType=VARCHAR}, #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, 
-      #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, 
+      #{discount,jdbcType=DECIMAL}, #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, 
-      #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, 
+      #{othermoney,jdbcType=DECIMAL}, #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, 
-      #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, 
+      #{accountday,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}, 
-      #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
+      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
-      #{deleteFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
     insert into jsh_depothead
@@ -165,9 +160,6 @@
       <if test="subtype != null">
         SubType,
       </if>
-      <if test="projectid != null">
-        ProjectId,
-      </if>
       <if test="defaultnumber != null">
         DefaultNumber,
       </if>
@@ -195,9 +187,6 @@
       <if test="changeamount != null">
         ChangeAmount,
       </if>
-      <if test="allocationprojectid != null">
-        AllocationProjectId,
-      </if>
       <if test="totalprice != null">
         TotalPrice,
       </if>
@@ -260,9 +249,6 @@
       <if test="subtype != null">
         #{subtype,jdbcType=VARCHAR},
       </if>
-      <if test="projectid != null">
-        #{projectid,jdbcType=BIGINT},
-      </if>
       <if test="defaultnumber != null">
         #{defaultnumber,jdbcType=VARCHAR},
       </if>
@@ -290,9 +276,6 @@
       <if test="changeamount != null">
         #{changeamount,jdbcType=DECIMAL},
       </if>
-      <if test="allocationprojectid != null">
-        #{allocationprojectid,jdbcType=BIGINT},
-      </if>
       <if test="totalprice != null">
         #{totalprice,jdbcType=DECIMAL},
       </if>
@@ -364,9 +347,6 @@
       <if test="record.subtype != null">
         SubType = #{record.subtype,jdbcType=VARCHAR},
       </if>
-      <if test="record.projectid != null">
-        ProjectId = #{record.projectid,jdbcType=BIGINT},
-      </if>
       <if test="record.defaultnumber != null">
         DefaultNumber = #{record.defaultnumber,jdbcType=VARCHAR},
       </if>
@@ -394,9 +374,6 @@
       <if test="record.changeamount != null">
         ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
       </if>
-      <if test="record.allocationprojectid != null">
-        AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
-      </if>
       <if test="record.totalprice != null">
         TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
       </if>
@@ -458,7 +435,6 @@
     set Id = #{record.id,jdbcType=BIGINT},
       Type = #{record.type,jdbcType=VARCHAR},
       SubType = #{record.subtype,jdbcType=VARCHAR},
-      ProjectId = #{record.projectid,jdbcType=BIGINT},
       DefaultNumber = #{record.defaultnumber,jdbcType=VARCHAR},
       Number = #{record.number,jdbcType=VARCHAR},
       OperPersonName = #{record.operpersonname,jdbcType=VARCHAR},
@@ -468,7 +444,6 @@
       HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
       AccountId = #{record.accountid,jdbcType=BIGINT},
       ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
-      AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
       TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
       PayType = #{record.paytype,jdbcType=VARCHAR},
       Remark = #{record.remark,jdbcType=VARCHAR},
@@ -499,9 +474,6 @@
       <if test="subtype != null">
         SubType = #{subtype,jdbcType=VARCHAR},
       </if>
-      <if test="projectid != null">
-        ProjectId = #{projectid,jdbcType=BIGINT},
-      </if>
       <if test="defaultnumber != null">
         DefaultNumber = #{defaultnumber,jdbcType=VARCHAR},
       </if>
@@ -529,9 +501,6 @@
       <if test="changeamount != null">
         ChangeAmount = #{changeamount,jdbcType=DECIMAL},
       </if>
-      <if test="allocationprojectid != null">
-        AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
-      </if>
       <if test="totalprice != null">
         TotalPrice = #{totalprice,jdbcType=DECIMAL},
       </if>
@@ -590,7 +559,6 @@
     update jsh_depothead
     set Type = #{type,jdbcType=VARCHAR},
       SubType = #{subtype,jdbcType=VARCHAR},
-      ProjectId = #{projectid,jdbcType=BIGINT},
       DefaultNumber = #{defaultnumber,jdbcType=VARCHAR},
       Number = #{number,jdbcType=VARCHAR},
       OperPersonName = #{operpersonname,jdbcType=VARCHAR},
@@ -600,7 +568,6 @@
       HandsPersonId = #{handspersonid,jdbcType=BIGINT},
       AccountId = #{accountid,jdbcType=BIGINT},
       ChangeAmount = #{changeamount,jdbcType=DECIMAL},
-      AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
       TotalPrice = #{totalprice,jdbcType=DECIMAL},
       PayType = #{paytype,jdbcType=VARCHAR},
       Remark = #{remark,jdbcType=VARCHAR},

src/main/resources/mapper_xml/DepotHeadMapperEx.xml

@@ -3,11 +3,9 @@
 <mapper namespace="com.jsh.erp.datasource.mappers.DepotHeadMapperEx">
 
     <resultMap extends="com.jsh.erp.datasource.mappers.DepotHeadMapper.BaseResultMap" id="ResultMapEx" type="com.jsh.erp.datasource.vo.DepotHeadVo4List">
-        <result column="ProjectName" jdbcType="VARCHAR" property="projectName" />
         <result column="OrganName" jdbcType="VARCHAR" property="organName" />
         <result column="HandsPersonName" jdbcType="VARCHAR" property="handsPersonName" />
         <result column="AccountName" jdbcType="VARCHAR" property="accountName" />
-        <result column="AllocationProjectName" jdbcType="VARCHAR" property="allocationProjectName" />
     </resultMap>
 
     <resultMap id="ResultWithInfoExMap" type="com.jsh.erp.datasource.vo.DepotHeadVo4InDetail">
@@ -42,13 +40,11 @@
     </resultMap>
 
     <select id="selectByConditionDepotHead" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">
-        select distinct dh.*, d.name ProjectName, s.supplier OrganName, p.name HandsPersonName, a.name AccountName, dd.name AllocationProjectName
+        select distinct dh.*, s.supplier OrganName, p.name HandsPersonName, a.name AccountName
         from jsh_depothead dh
-        left join jsh_depot d on dh.ProjectId=d.id and ifnull(d.delete_Flag,'0') !='1'
         left join jsh_supplier s on dh.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
         left join jsh_person p on dh.HandsPersonId=p.id and ifnull(p.delete_Flag,'0') !='1'
         left join jsh_account a on dh.AccountId=a.id and ifnull(a.delete_Flag,'0') !='1'
-        left join jsh_depot dd on dh.AllocationProjectId=dd.id and ifnull(dd.delete_Flag,'0') !='1'
         left join jsh_depotitem di on dh.Id = di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
         left join jsh_material m on di.MaterialId = m.Id and ifnull(m.delete_Flag,'0') !='1'
         where 1=1