Skip to content
GitLab
Commit 2195b8bf authored by 季圣华's avatar 季圣华
Browse files

增加订单转采购和销售的功能

parent 49df4bad
Expand all Hide whitespace changes
Inline Side-by-side
erp_web/js/pages/materials/bill_detail.js
View file @ 2195b8bf
...@@ -210,6 +210,7 @@ ...@@ -210,6 +210,7 @@
$("#bill .OrganIdShow").text(data.organName); $("#bill .OrganIdShow").text(data.organName);
$("#bill .OperTimeShow").text(data.opertimeStr); $("#bill .OperTimeShow").text(data.opertimeStr);
$("#bill .NumberShow").text(data.number); $("#bill .NumberShow").text(data.number);
$("#bill .LinkNumberShow").text(data.linknumber? data.linknumber : "");
$("#bill .RemarkShow").text(data.remark); $("#bill .RemarkShow").text(data.remark);
$("#bill .DiscountShow").text(data.discount); $("#bill .DiscountShow").text(data.discount);
$("#bill .DiscountMoneyShow").text(data.discountmoney); $("#bill .DiscountMoneyShow").text(data.discountmoney);
......
erp_web/js/pages/materials/in_out.js
View file @ 2195b8bf
This diff is collapsed.
erp_web/pages/materials/bill_detail.html
View file @ 2195b8bf
...@@ -173,8 +173,10 @@ ...@@ -173,8 +173,10 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="NumberShow"></span> <span class="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td> <td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:140px;"></td> <td style="padding:5px;width:130px;">
<span class="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -222,10 +224,8 @@ ...@@ -222,10 +224,8 @@
<td style="padding:5px"> <td style="padding:5px">
<span class="OtherMoneyShow"></span> <span class="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td></td>
<td style="padding:5px"> <td style="padding:5px"></td>
<span class="AccountDayShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
</table> </table>
...@@ -312,18 +312,18 @@ ...@@ -312,18 +312,18 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span class="OrganIdShow"></span> <span class="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span class="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span> <span class="OperTimeShow"></span>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="NumberShow"></span> <span class="NumberShow"></span>
</td> </td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span class="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -371,9 +371,9 @@ ...@@ -371,9 +371,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span class="OtherMoneyShow"></span> <span class="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span class="AccountDayShow"></span> <span class="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -388,10 +388,6 @@ ...@@ -388,10 +388,6 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span class="OrganIdShow"></span> <span class="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span class="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td> <td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span> <span class="OperTimeShow"></span>
...@@ -400,6 +396,8 @@ ...@@ -400,6 +396,8 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="NumberShow"></span> <span class="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td>
<td style="padding:5px;width:130px;"></td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -447,8 +445,9 @@ ...@@ -447,8 +445,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span class="OtherMoneyShow"></span> <span class="OtherMoneyShow"></span>
</td> </td>
<td></td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span class="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
......
erp_web/pages/materials/purchase_in_list.html
View file @ 2195b8bf
...@@ -82,8 +82,9 @@ ...@@ -82,8 +82,9 @@
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;"></td> <td style="width:70px;">关联订单：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -135,10 +136,8 @@ ...@@ -135,10 +136,8 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td>结算天数：</td> <td></td>
<td style="padding:5px"> <td style="padding:5px">
<input id="AccountDay" name="AccountDay" class="easyui-validatebox"
data-options="validType:'length[1,3]'" style="width:120px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -167,8 +166,10 @@ ...@@ -167,8 +166,10 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td> <td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:140px;"></td> <td style="padding:5px;width:140px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -216,10 +217,8 @@ ...@@ -216,10 +217,8 @@
<td style="padding:5px"> <td style="padding:5px">
<span id="OtherMoneyShow"></span> <span id="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td></td>
<td style="padding:5px"> <td style="padding:5px"></td>
<span id="AccountDayShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
</table> </table>
......
erp_web/pages/materials/sale_back_list.html
View file @ 2195b8bf
...@@ -65,10 +65,6 @@ ...@@ -65,10 +65,6 @@
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:110px;"/> <input id="OrganId" name="OrganId" style="width:110px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td>单据日期：</td> <td>单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
...@@ -80,6 +76,8 @@ ...@@ -80,6 +76,8 @@
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;"></td>
<td style="padding:5px"></td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -130,8 +128,9 @@ ...@@ -130,8 +128,9 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td></td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -151,10 +150,6 @@ ...@@ -151,10 +150,6 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td> <td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
...@@ -163,6 +158,8 @@ ...@@ -163,6 +158,8 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td>
<td style="padding:5px;width:130px;"></td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -210,8 +207,9 @@ ...@@ -210,8 +207,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span id="OtherMoneyShow"></span> <span id="OtherMoneyShow"></span>
</td> </td>
<td></td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
......
erp_web/pages/materials/sale_orders_list.html
View file @ 2195b8bf
...@@ -65,21 +65,21 @@ ...@@ -65,21 +65,21 @@
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/> <input id="OrganId" name="OrganId" style="width:130px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;" readonly/> style="width:140px;" readonly/>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -110,18 +110,18 @@ ...@@ -110,18 +110,18 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
......
erp_web/pages/materials/sale_out_list.html
View file @ 2195b8bf
...@@ -65,21 +65,21 @@ ...@@ -65,21 +65,21 @@
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/> <input id="OrganId" name="OrganId" style="width:130px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;" readonly/> style="width:140px;" readonly/>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px">
<input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -130,10 +130,9 @@ ...@@ -130,10 +130,9 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td>结算天数：</td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="AccountDay" name="AccountDay" class="easyui-numberbox" <input id="Salesman" name="Salesman" style="width:130px;"/>
data-options="validType:'length[1,3]'" style="width:120px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -153,18 +152,18 @@ ...@@ -153,18 +152,18 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -212,9 +211,9 @@ ...@@ -212,9 +211,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span id="OtherMoneyShow"></span> <span id="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="AccountDayShow"></span> <span id="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
......
sql/jsh_erp.sql
View file @ 2195b8bf
...@@ -1345,4 +1345,12 @@ update jsh_functions SET PushBtn = '3' where Number = '060301' and PNumber = '06 ...@@ -1345,4 +1345,12 @@ update jsh_functions SET PushBtn = '3' where Number = '060301' and PNumber = '06
-- ---------------------------- -- ----------------------------
update jsh_userbusiness SET update jsh_userbusiness SET
BtnStr = '[{"funId":"25","btnStr":"1"},{"funId":"217","btnStr":"1"},{"funId":"218","btnStr":"1"},{"funId":"241","btnStr":"3"},{"funId":"242","btnStr":"3"}]' BtnStr = '[{"funId":"25","btnStr":"1"},{"funId":"217","btnStr":"1"},{"funId":"218","btnStr":"1"},{"funId":"241","btnStr":"3"},{"funId":"242","btnStr":"3"}]'
where Id = 5; where Id = 5;
\ No newline at end of file
-- ----------------------------
-- 时间：2019年3月10日
-- version：1.0.8
-- 改状态字段的类型，增加关联单据字段
-- ----------------------------
alter table jsh_depothead change Status Status varchar(1) DEFAULT '0' COMMENT '状态，0未审核、1已审核、2已转采购|销售';
alter table jsh_depothead add `LinkNumber` varchar(50) DEFAULT null COMMENT '关联订单号';
\ No newline at end of file
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View file @ 2195b8bf
...@@ -51,6 +51,12 @@ public class BusinessConstants { ...@@ -51,6 +51,12 @@ public class BusinessConstants {
* */ * */
public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1"; public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1";
public static final String ENABLE_SERIAL_NUMBER_NOT_ENABLED = "0"; public static final String ENABLE_SERIAL_NUMBER_NOT_ENABLED = "0";
/**
* 单据状态 billsStatus '0'未审核 '1'审核 '2'已转采购|销售
* */
public static final String BILLS_STATUS_UN_AUDIT = "0";
public static final String BILLS_STATUS_AUDIT = "1";
public static final String BILLS_STATUS_SKIP = "2";
/** /**
* 出入库分类 * 出入库分类
*采购、采购退货、其它、零售、销售、调拨 *采购、采购退货、其它、零售、销售、调拨
......
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View file @ 2195b8bf
...@@ -51,7 +51,7 @@ public class DepotHeadController { ...@@ -51,7 +51,7 @@ public class DepotHeadController {
* @return * @return
*/ */
@PostMapping(value = "/batchSetStatus") @PostMapping(value = "/batchSetStatus")
public String batchSetStatus(@RequestParam("status") Boolean status, public String batchSetStatus(@RequestParam("status") String status,
@RequestParam("depotHeadIDs") String depotHeadIDs, @RequestParam("depotHeadIDs") String depotHeadIDs,
HttpServletRequest request) { HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>(); Map<String, Object> objectMap = new HashMap<String, Object>();
...@@ -64,20 +64,12 @@ public class DepotHeadController { ...@@ -64,20 +64,12 @@ public class DepotHeadController {
} }
/** /**
* 单据编号生成接口，规则：查找当前类型单据下的当天最大的单据号，并加1 * 单据编号生成接口
* @param type
* @param subType
* @param beginTime
* @param endTime
* @param request * @param request
* @return * @return
*/ */
@GetMapping(value = "/buildNumber") @GetMapping(value = "/buildNumber")
public BaseResponseInfo buildNumber(@RequestParam("type") String type, public BaseResponseInfo buildNumber(HttpServletRequest request) {
@RequestParam("subType") String subType,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
......
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
View file @ 2195b8bf
package com.jsh.erp.datasource.mappers; package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotHead; import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample; import com.jsh.erp.datasource.entities.DepotHeadExample;
import java.util.List;
import java.math.BigDecimal; import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DepotHeadMapper {
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail; /**
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount; * This method was generated by MyBatis Generator.
import com.jsh.erp.datasource.vo.DepotHeadVo4List; * This method corresponds to the database table jsh_depothead
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount; *
import org.apache.ibatis.annotations.Param; * @mbggenerated
*/
public interface DepotHeadMapper { int countByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int countByExample(DepotHeadExample example); */
int deleteByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int deleteByExample(DepotHeadExample example); */
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int deleteByPrimaryKey(Long id); */
int insert(DepotHead record);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int insert(DepotHead record); */
int insertSelective(DepotHead record);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int insertSelective(DepotHead record); */
List<DepotHead> selectByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
List<DepotHead> selectByExample(DepotHeadExample example); */
DepotHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
DepotHead selectByPrimaryKey(Long id); */
int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); */
int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); */
int updateByPrimaryKeySelective(DepotHead record);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int updateByPrimaryKeySelective(DepotHead record); */
int updateByPrimaryKey(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotHead record);
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
View file @ 2195b8bf
...@@ -59,7 +59,9 @@ public class DepotHeadVo4List { ...@@ -59,7 +59,9 @@ public class DepotHeadVo4List {
private Integer accountday; private Integer accountday;
private Boolean status; private String status;
private String linknumber;
private String projectName; private String projectName;
...@@ -291,14 +293,22 @@ public class DepotHeadVo4List { ...@@ -291,14 +293,22 @@ public class DepotHeadVo4List {
this.accountday = accountday; this.accountday = accountday;
} }
public Boolean getStatus() { public String getStatus() {
return status; return status;
} }
public void setStatus(Boolean status) { public void setStatus(String status) {
this.status = status; this.status = status;
} }
public String getLinknumber() {
return linknumber;
}
public void setLinknumber(String linknumber) {
this.linknumber = linknumber;
}
public String getProjectName() { public String getProjectName() {
return projectName; return projectName;
} }
......
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View file @ 2195b8bf
...@@ -106,7 +106,7 @@ public class DepotHeadService { ...@@ -106,7 +106,7 @@ public class DepotHeadService {
depotHead.setOperpersonname(uName); depotHead.setOperpersonname(uName);
} }
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis())); depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
depotHead.setStatus(false); depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
return depotHeadMapper.insert(depotHead); return depotHeadMapper.insert(depotHead);
} }
...@@ -142,7 +142,7 @@ public class DepotHeadService { ...@@ -142,7 +142,7 @@ public class DepotHeadService {
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchSetStatus(Boolean status, String depotHeadIDs) { public int batchSetStatus(String status, String depotHeadIDs) {
List<Long> ids = StringUtil.strToLongList(depotHeadIDs); List<Long> ids = StringUtil.strToLongList(depotHeadIDs);
DepotHead depotHead = new DepotHead(); DepotHead depotHead = new DepotHead();
depotHead.setStatus(status); depotHead.setStatus(status);
...@@ -275,7 +275,7 @@ public class DepotHeadService { ...@@ -275,7 +275,7 @@ public class DepotHeadService {
User userInfo=userService.getCurrentUser(); User userInfo=userService.getCurrentUser();
depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername()); depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis())); depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
depotHead.setStatus(false); depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
depotHeadMapperEx.adddepotHead(depotHead); depotHeadMapperEx.adddepotHead(depotHead);
/**入库和出库处理预付款信息*/ /**入库和出库处理预付款信息*/
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){ if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
...@@ -285,6 +285,14 @@ public class DepotHeadService { ...@@ -285,6 +285,14 @@ public class DepotHeadService {
} }
/**入库和出库处理单据子表信息*/ /**入库和出库处理单据子表信息*/
depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId()); depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId());
/**如果关联单据号非空则更新订单的状态为2 */
if(depotHead.getLinknumber()!=null) {
DepotHead depotHeadOrders = new DepotHead();
depotHeadOrders.setStatus(BusinessConstants.BILLS_STATUS_SKIP);
DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andNumberEqualTo(depotHead.getLinknumber());
depotHeadMapper.updateByExampleSelective(depotHeadOrders, example);
}
} }
/** /**
* create by: cjl * create by: cjl
......
src/main/resources/mapper_xml/DepotHeadMapper.xml
View file @ 2195b8bf
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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.DepotHeadMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.DepotHeadMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead">
<!-- <!--
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
<result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" /> <result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" />
<result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" /> <result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" />
<result column="AccountDay" jdbcType="INTEGER" property="accountday" /> <result column="AccountDay" jdbcType="INTEGER" property="accountday" />
<result column="Status" jdbcType="BIT" property="status" /> <result column="Status" jdbcType="VARCHAR" property="status" />
<result column="LinkNumber" jdbcType="VARCHAR" property="linknumber" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -109,7 +110,8 @@ ...@@ -109,7 +110,8 @@
Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime, Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime,
OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice, OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice,
PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney, PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney,
DiscountLastMoney, OtherMoney, OtherMoneyList, OtherMoneyItem, AccountDay, Status DiscountLastMoney, OtherMoney, OtherMoneyList, OtherMoneyItem, AccountDay, Status,
LinkNumber
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -171,7 +173,7 @@ ...@@ -171,7 +173,7 @@
AccountIdList, AccountMoneyList, Discount, AccountIdList, AccountMoneyList, Discount,
DiscountMoney, DiscountLastMoney, OtherMoney, DiscountMoney, DiscountLastMoney, OtherMoney,
OtherMoneyList, OtherMoneyItem, AccountDay, OtherMoneyList, OtherMoneyItem, AccountDay,
Status) Status, LinkNumber)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR},
#{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR},
#{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP},
...@@ -181,7 +183,7 @@ ...@@ -181,7 +183,7 @@
#{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
#{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL},
#{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER},
#{status,jdbcType=BIT}) #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
<!-- <!--
...@@ -274,6 +276,9 @@ ...@@ -274,6 +276,9 @@
<if test="status != null"> <if test="status != null">
Status, Status,
</if> </if>
<if test="linknumber != null">
LinkNumber,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -358,7 +363,10 @@ ...@@ -358,7 +363,10 @@
#{accountday,jdbcType=INTEGER}, #{accountday,jdbcType=INTEGER},
</if> </if>
<if test="status != null"> <if test="status != null">
#{status,jdbcType=BIT}, #{status,jdbcType=VARCHAR},
</if>
<if test="linknumber != null">
#{linknumber,jdbcType=VARCHAR},
</if> </if>
</trim> </trim>
</insert> </insert>
...@@ -461,7 +469,10 @@ ...@@ -461,7 +469,10 @@
AccountDay = #{record.accountday,jdbcType=INTEGER}, AccountDay = #{record.accountday,jdbcType=INTEGER},
</if> </if>
<if test="record.status != null"> <if test="record.status != null">
Status = #{record.status,jdbcType=BIT}, Status = #{record.status,jdbcType=VARCHAR},
</if>
<if test="record.linknumber != null">
LinkNumber = #{record.linknumber,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -501,7 +512,8 @@ ...@@ -501,7 +512,8 @@
OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR}, OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR}, OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
AccountDay = #{record.accountday,jdbcType=INTEGER}, AccountDay = #{record.accountday,jdbcType=INTEGER},
Status = #{record.status,jdbcType=BIT} Status = #{record.status,jdbcType=VARCHAR},
LinkNumber = #{record.linknumber,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -592,7 +604,10 @@ ...@@ -592,7 +604,10 @@
AccountDay = #{accountday,jdbcType=INTEGER}, AccountDay = #{accountday,jdbcType=INTEGER},
</if> </if>
<if test="status != null"> <if test="status != null">
Status = #{status,jdbcType=BIT}, Status = #{status,jdbcType=VARCHAR},
</if>
<if test="linknumber != null">
LinkNumber = #{linknumber,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
...@@ -629,7 +644,8 @@ ...@@ -629,7 +644,8 @@
OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR}, OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR}, OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
AccountDay = #{accountday,jdbcType=INTEGER}, AccountDay = #{accountday,jdbcType=INTEGER},
Status = #{status,jdbcType=BIT} Status = #{status,jdbcType=VARCHAR},
LinkNumber = #{linknumber,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View file @ 2195b8bf
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
AccountIdList, AccountMoneyList, Discount, AccountIdList, AccountMoneyList, Discount,
DiscountMoney, DiscountLastMoney, OtherMoney, DiscountMoney, DiscountLastMoney, OtherMoney,
OtherMoneyList, OtherMoneyItem, AccountDay, OtherMoneyList, OtherMoneyItem, AccountDay,
Status) Status, LinkNumber)
values (#{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, values (#{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR},
#{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR},
#{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP},
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
#{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
#{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL},
#{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER},
#{status,jdbcType=BIT}) #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR})
</insert> </insert>
<update id="updatedepotHead" parameterType="com.jsh.erp.datasource.entities.DepotHead"> <update id="updatedepotHead" parameterType="com.jsh.erp.datasource.entities.DepotHead">
update jsh_depothead update jsh_depothead
...@@ -384,7 +384,10 @@ ...@@ -384,7 +384,10 @@
AccountDay = #{accountday,jdbcType=INTEGER}, AccountDay = #{accountday,jdbcType=INTEGER},
</if> </if>
<if test="status != null"> <if test="status != null">
Status = #{status,jdbcType=BIT}, Status = #{status,jdbcType=VARCHAR},
</if>
<if test="linknumber != null">
LinkNumber = #{linknumber,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment