diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index cfa761ff..d9c9d249 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -23,7 +23,8 @@
var organUrl = ""; //组织数据接口地址
var amountNum = ""; //单据编号开头字符
var depotString = ""; //店铺id列表
- var orgDefaultId = 0; //单位默认编号
+ /**默认编号有意义吗，不如空着吧*/
+ var orgDefaultId=''; //单位默认编号
var orgDefaultList; //存储查询出来的会员列表
var accountList; //账户列表
var outItemList; //支出项目列表
@@ -682,7 +683,7 @@
}
}
thisStock = (thisStock / loadRatio).toFixed(2);
- body.find("[field='Stock']").find(input).val(thisStock).attr("data-stock", res.rows[0].thisSum); //加载库存数据
+ body.find("[field='Stock']").find(input).val(thisStock).attr("data-stock", res.data.page[0].thisSum); //加载库存数据
}
else {
body.find("[field='Stock']").find(input).val(0).attr("data-stock", 0); //加载库存数据
@@ -757,14 +758,20 @@
anotherDepotTextField = "depotName";
}
if(listSubType == "礼品充值"){
+ /**
+ * who added the .action
+ * */
isShowAnotherDepot = false; //礼品充值时候显示礼品卡
anotherDepotHeadName = "礼品卡";
- anotherDepotUrl = "/depot/findGiftByType.action?type=1";
+ anotherDepotUrl = "/depot/findGiftByType?type=1";
anotherDepotTextField = "name";
}
if(listSubType == "礼品销售"){
+ /**
+ * who added the .action
+ * */
depotHeadName = "礼品卡";
- depotUrl = "/depot/findGiftByType.action?type=1";
+ depotUrl = "/depot/findGiftByType?type=1";
depotTextField = "name";
}
else {
@@ -1290,8 +1297,12 @@
if (r) {
$.ajax({
type:"post",
- url: "/depotHead/" + depotHeadID + "/delete",
+ // url: "/depotHead/" + depotHeadID + "/delete",
+ url: "/depotHead/deleteDepotHeadAndDetail",
dataType: "json",
+ data:{
+ id: depotHeadID
+ },
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -1382,7 +1393,8 @@
//批量删除
$.ajax({
type:"post",
- url: "/depotHead/batchDelete",
+ // url: "/depotHead/batchDelete",
+ url: "/depotHead/batchDeleteDepotHeadAndDetail",
dataType: "json",
async : false,
data: ({
@@ -1560,7 +1572,7 @@
$("#addOrgan").off("click").on("click",function(){
$('#supplierDlg').dialog('open').dialog('setTitle','
增加供应商信息');
});
- url = '/depotHead/add';
+ url = '/depotHead/addDepotHeadAndDetail';
//零售单据修改收款时，自动计算找零
if(listSubType == "零售" || listSubType == "零售退货") {
@@ -1628,7 +1640,7 @@
}
$("#Number").val(depotHeadInfo[2]).attr("data-defaultNumber",depotHeadInfo[2]);
$("#OperTime").val(depotHeadInfo[4]);
- $('#OrganId').combobox('setValue', depotHeadInfo[5]);
+ $('#OrganId').combobox('setValue', depotHeadInfo[5]=='undefined'?'':depotHeadInfo[5]);
$("#HandsPersonId").val(depotHeadInfo[6]);
$("#AccountId").val(depotHeadInfo[7]);
$("#ChangeAmount").val(depotHeadInfo[8]);
@@ -1715,7 +1727,7 @@
initTableData_material("edit",TotalPrice); //商品列表
reject(); //撤销下、刷新商品列表
- url = '/depotHead/update?id=' + depotHeadInfo[0];
+ url = '/depotHead/updateDepotHeadAndDetail?id=' + depotHeadInfo[0];
}
//查看信息
@@ -1899,6 +1911,18 @@
return flag;
}
//保存信息
+ /**
+ * 2019-01-25
+ * 我对这个方法的实现结果存在严重怀疑，决定重构
+ * 有如下疑点：
+ * 1、保存完主表，返回结果后，再发起请求去操作子表，如何保证事务的一致性（业务数据一致性）
+ * 2、保存完主表后，再通过selectmax的方式去获取主表主键id完全就是看人品的不可靠的思路
+ * 修改计划：
+ * 2019-01-25修改零售出库相关操作
+ * 修改方式，重写url，将主从表操作合并
+ *
+ *
+ * **/
$("#saveDepotHead").off("click").on("click",function(){
if(!$('#depotHeadFM').form('validate')){
return;
@@ -1961,6 +1985,7 @@
$.messager.alert('提示', '选择多账户时的找零金额不能大于0！', 'warning');
return;
}
+
}
else if(listTitle === "销售出库列表"){
if(!$('#OrganId').combobox('getValue')){
@@ -2052,38 +2077,49 @@
if($("#AccountId").val() === "many"){ //多账户
getAccountID = null;
}
+ var infoStr=JSON.stringify({
+ Type: listType,
+ SubType: listSubType,
+ ProjectId: ProjectId,
+ AllocationProjectId: AllocationProjectId,
+ DefaultNumber: $.trim($("#Number").attr("data-defaultNumber")),//初始编号
+ Number: $.trim($("#Number").val()),
+ OperTime: $("#OperTime").val(),
+ OrganId: OrganId,
+ HandsPersonId: $.trim($("#HandsPersonId").val()),
+ Salesman: SalesmanStr, //销售人员
+ AccountId: getAccountID,
+ ChangeAmount: ChangeAmount, //付款/收款
+ TotalPrice: TotalPrice, //合计
+ PayType: thisPayType, //现付/预付款
+ Remark: $.trim($("#Remark").val()),
+ AccountIdList: $("#AccountId").attr("data-accountarr"), //账户列表-多账户
+ AccountMoneyList: accountMoneyArr ? JSON.stringify(accountMoneyArr) : "", //账户金额列表-多账户
+ Discount: $.trim($("#Discount").val()),
+ DiscountMoney: $.trim($("#DiscountMoney").val()),
+ DiscountLastMoney: $.trim($("#DiscountLastMoney").val()),
+ OtherMoney: $.trim($("#OtherMoney").val()), //采购费用、销售费用
+ OtherMoneyList: $("#OtherMoney").attr("data-itemarr"), //支出项目列表-涉及费用
+ OtherMoneyItem: $("#OtherMoney").attr("data-itemmoneyarr"), //支出项目金额列表-涉及费用
+ AccountDay: $("#AccountDay").val() //结算天数
+ });
+ /**
+ * 零售出库，单独操作
+ * */
+ if(url.indexOf("/depotHead/addDepotHeadAndDetail")>=0){
+ addDepotHeadAndDetail(url,infoStr);
+ return;
+ }else if(url.indexOf("/depotHead/updateDepotHeadAndDetail")>=0){
+ updateDepotHeadAndDetail(url,infoStr,preTotalPrice);
+ return;
+ }
$.ajax({
type:"post",
url: url,
dataType: "json",
async : false,
data: ({
- info : JSON.stringify({
- Type: listType,
- SubType: listSubType,
- ProjectId: ProjectId,
- AllocationProjectId: AllocationProjectId,
- DefaultNumber: $.trim($("#Number").attr("data-defaultNumber")),//初始编号
- Number: $.trim($("#Number").val()),
- OperTime: $("#OperTime").val(),
- OrganId: OrganId,
- HandsPersonId: $.trim($("#HandsPersonId").val()),
- Salesman: SalesmanStr, //销售人员
- AccountId: getAccountID,
- ChangeAmount: ChangeAmount, //付款/收款
- TotalPrice: TotalPrice, //合计
- PayType: thisPayType, //现付/预付款
- Remark: $.trim($("#Remark").val()),
- AccountIdList: $("#AccountId").attr("data-accountarr"), //账户列表-多账户
- AccountMoneyList: accountMoneyArr ? JSON.stringify(accountMoneyArr) : "", //账户金额列表-多账户
- Discount: $.trim($("#Discount").val()),
- DiscountMoney: $.trim($("#DiscountMoney").val()),
- DiscountLastMoney: $.trim($("#DiscountLastMoney").val()),
- OtherMoney: $.trim($("#OtherMoney").val()), //采购费用、销售费用
- OtherMoneyList: $("#OtherMoney").attr("data-itemarr"), //支出项目列表-涉及费用
- OtherMoneyItem: $("#OtherMoney").attr("data-itemmoneyarr"), //支出项目金额列表-涉及费用
- AccountDay: $("#AccountDay").val() //结算天数
- })
+ info:infoStr
}),
success: function (tipInfo)
{
@@ -2955,7 +2991,103 @@
}
}
-
+ /**
+ * 新增单据主表及单据子表
+ * */
+ function addDepotHeadAndDetail(url,infoStr){
+ var inserted = $("#materialData").datagrid('getChanges', "inserted");
+ var deleted = $("#materialData").datagrid('getChanges', "deleted");
+ var updated = $("#materialData").datagrid('getChanges', "updated");
+ $.ajax({
+ type:"post",
+ url: url,
+ dataType: "json",
+ async : false,
+ data: ({
+ info:infoStr,
+ inserted: JSON.stringify(inserted),
+ deleted: JSON.stringify(deleted),
+ updated: JSON.stringify(updated)
+ }),
+ success: function (tipInfo){
+
+ if(tipInfo){
+ if(tipInfo.code!=200){
+ $.messager.alert('提示', tipInfo.msg, 'error');
+ return;
+ }
+ $.messager.alert('提示','保存成功！','info');
+ $('#depotHeadDlg').dialog('close');
+ var opts = $("#tableData").datagrid('options');
+ showDepotHeadDetails(opts.pageNumber,opts.pageSize);
+
+ }else {
+ $.messager.show({
+ title: '错误提示',
+ msg: '保存信息失败，请稍后重试!'
+ });
+ }
+
+ },
+ //此处添加错误处理
+ error:function()
+ {
+ $.messager.alert('提示','保存信息异常，请稍后再试！','error');
+ return;
+ }
+
+
+ });
+ }
+ /**
+ * 修改单据主表及单据子表
+ * */
+ function updateDepotHeadAndDetail(url,infoStr,preTotalPrice){
+ var inserted = $("#materialData").datagrid('getChanges', "inserted");
+ var deleted = $("#materialData").datagrid('getChanges', "deleted");
+ var updated = $("#materialData").datagrid('getChanges', "updated");
+ $.ajax({
+ type:"post",
+ url: url,
+ dataType: "json",
+ async : false,
+ data: ({
+ id:url.substring(url.lastIndexOf("?id=")+4,url.length),
+ info:infoStr,
+ inserted: JSON.stringify(inserted),
+ deleted: JSON.stringify(deleted),
+ updated: JSON.stringify(updated),
+ preTotalPrice:preTotalPrice
+ }),
+ success: function (tipInfo){
+ if(tipInfo){
+ if(tipInfo.code!=200){
+ $.messager.alert('提示', tipInfo.msg, 'error');
+ return;
+ }
+ $.messager.alert('提示','保存成功！','info');
+ $('#depotHeadDlg').dialog('close');
+ var opts = $("#tableData").datagrid('options');
+ showDepotHeadDetails(opts.pageNumber,opts.pageSize);
+ if (endEditing()) {
+ $('#materialData').datagrid('acceptChanges');
+ }
+ }else {
+ $.messager.show({
+ title: '错误提示',
+ msg: '保存信息失败，请稍后重试!'
+ });
+ }
+
+ },
+ //此处添加错误处理
+ error:function()
+ {
+ $.messager.alert('提示','保存信息异常，请稍后再试！','error');
+ return;
+ }
+ });
+ }
diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html
index 2ad42c73..5b19750b 100644
--- a/erp_web/pages/manage/serialNumber.html
+++ b/erp_web/pages/manage/serialNumber.html
@@ -155,11 +155,11 @@
{title: '商品名称', field: 'materialName', width: 100},
{title: '序列号', field: 'serialNumber', width: 80},
{title: '已卖出', field: 'isSell', width: 150 , formatter: function (value) {
- return value ? "是" : "否";
+ return value=='1' ? "是" : "否";
}
},
{title: '已删除', field: 'deleteFlag', width: 60, formatter: function (value) {
- return value ? "是" : "否";
+ return value=='1' ? "是" : "否";
}
},
{title: '创建时间', field: 'createTime', width: 140,formatter: formatDatebox},
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 63c791e6..8f53413b 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -684,7 +684,7 @@
},
{
title: '序列号', field: 'enableSerialNumber', width: 70, align: "center", formatter: function (value) {
- return value ? "启用" : "禁用";
+ return value=='1' ? "启用" : "禁用";
}
}
]],
@@ -1363,7 +1363,7 @@
// console.log("enableSerialNumber:"+(materialInfo[24]=='true'?'1':'0'));
// console.log("enableSerialNumber:"+materialInfo[24]);
// $("#enableSerialNumber").combobox('setValue',materialInfo[24]=='true'?'1':'0');
- $("#enableSerialNumber").val(materialInfo[24]=='true'?'1':'0');
+ $("#enableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
// console.log($("#enableSerialNumber").val());
var categoryName = ""; //类型名称
diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql
index e62ae3af..74c8c29a 100644
--- a/sql/jsh_erp.sql
+++ b/sql/jsh_erp.sql
@@ -5219,5 +5219,25 @@ alter table jsh_material add enableSerialNumber bit(1) DEFAULT 0 COMMENT '是否
-- ----------------------------
delete from `jsh_functions` where Name='序列号';
INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`) VALUES ('010104', '序列号', '0101', '../manage/serialNumber.html', b'0', '0246', b'1', '电脑版', '');
-
-
+-- ----------------------------
+-- 删除单据主表供应商id字段对应外键约束
+-- ----------------------------
+ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_3;
+-- ----------------------------
+-- 序列号表添加单据主表id字段，用于跟踪序列号流向
+-- ----------------------------
+alter table jsh_serial_number add depothead_Id bigint(20) DEFAULT null COMMENT '单据主表id，用于跟踪序列号流向';
+-- ----------------------------
+-- 修改商品表enableSerialNumber字段类型为varchar(1)
+-- ----------------------------
+alter table jsh_material change enableSerialNumber enableSerialNumber varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是';
+-- ----------------------------
+-- 修改序列号表is_Sell字段类型为varchar(1)
+-- 修改序列号表delete_Flag字段类型为varchar(1)
+-- ----------------------------
+alter table jsh_serial_number change is_Sell is_Sell varchar(1) DEFAULT '0' COMMENT '是否卖出，0未卖出，1卖出';
+alter table jsh_serial_number change delete_Flag delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+-- ----------------------------
+-- 删除单据子表单据主表id字段对应外键约束
+-- ----------------------------
+ALTER TABLE jsh_depotitem DROP FOREIGN KEY jsh_depotitem_ibfk_1;
\ No newline at end of file
diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx
index cc2f72ea..8bf618b5 100644
Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ
diff --git a/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
index 9842ebff..789a9590 100644
--- a/src/main/java/com/jsh/erp/constants/BusinessConstants.java
+++ b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
@@ -21,18 +21,45 @@ public class BusinessConstants {
* 默认的分页页数
*/
public static final String DEFAULT_PAGINATION_PAGE_SIZE = "10";
- /**
- * 商品是否开启序列号标识enableSerialNumber 0否false，1是true
- *
- * */
- public static final boolean MATERIAL_ENABLE_SERIAL_NUMBER = true;
- public static final boolean MATERIAL_NOT_ENABLE_SERIAL_NUMBER = false;
/**
* 单据主表出入库类型 type 入库 出库
* depothead
* */
public static final String DEPOTHEAD_TYPE_STORAGE = "入库";
public static final String DEPOTHEAD_TYPE_OUT = "出库";
+ /**
+ * 付款类型 payType //现付/预付款
+ * */
+ public static final String PAY_TYPE_PREPAID = "预付款";
+ public static final String PAY_TYPE_BY_CASH = "现付";
+ /**
+ * 删除标记 deleteFlag '0'未删除 '1'已删除
+ * */
+ public static final String DELETE_FLAG_DELETED = "1";
+ public static final String DELETE_FLAG_EXISTS = "0";
+ /**
+ * 是否卖出 isSell '0'未卖出 '1'已卖出
+ * */
+ public static final String IS_SELL_SELLED = "1";
+ public static final String IS_SELL_HOLD = "0";
+ /**
+ * 商品是否开启序列号标识enableSerialNumber '0'未启用 '1'启用
+ * */
+ public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1";
+ public static final String ENABLE_SERIAL_NUMBER_NOT_ENABLED = "0";
+ /**
+ * 出入库分类
+ *采购、采购退货、其它、零售、销售、调拨、礼品充值
+ * */
+ public static final String SUB_TYPE_PURCHASE = "采购";
+ public static final String SUB_TYPE_PURCHASE_TETURNS = "采购退货";
+ public static final String SUB_TYPE_OTHER = "其它";
+ public static final String SUB_TYPE_RETAIL = "零售";
+ public static final String SUB_TYPE_SALES = "销售";
+ public static final String SUB_TYPE_TRANSFER = "调拨";
+
+
+
diff --git a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
index 913eaf53..6e795ca1 100644
--- a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
+++ b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
@@ -34,6 +34,9 @@ public class ExceptionConstants {
/**序列号不能为为空*/
public static final int SERIAL_NUMBERE_NOT_BE_EMPTY_CODE = 10500000;
public static final String SERIAL_NUMBERE_NOT_BE_EMPTY_MSG = "序列号不能为为空";
+ /**商品%s下序列号不充足，请补充后重试*/
+ public static final int MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE = 10500000;
+ public static final String MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG = "商品:%s下序列号不充足，请补充后重试";
diff --git a/src/main/java/com/jsh/erp/controller/DepotController.java b/src/main/java/com/jsh/erp/controller/DepotController.java
index 64a6c840..3a195a1e 100644
--- a/src/main/java/com/jsh/erp/controller/DepotController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotController.java
@@ -1,152 +1,152 @@
-package com.jsh.erp.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.jsh.erp.datasource.entities.Depot;
-import com.jsh.erp.service.depot.DepotService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
-import com.jsh.erp.utils.BaseResponseInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataAccessException;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author ji sheng hua 752*718*920
- */
-@RestController
-@RequestMapping(value = "/depot")
-public class DepotController {
- private Logger logger = LoggerFactory.getLogger(DepotController.class);
-
- @Resource
- private DepotService depotService;
-
- @Resource
- private UserBusinessService userBusinessService;
-
- @GetMapping(value = "/getAllList")
- public BaseResponseInfo getAllList(HttpServletRequest request) {
- BaseResponseInfo res = new BaseResponseInfo();
- try {
- List depotList = depotService.getAllList();
- res.code = 200;
- res.data = depotList;
- } catch(Exception e){
- e.printStackTrace();
- res.code = 500;
- res.data = "获取数据失败";
- }
- return res;
- }
-
- /**
- * 用户对应仓库显示
- * @param type
- * @param keyId
- * @param request
- * @return
- */
- @PostMapping(value = "/findUserDepot")
- public JSONArray findUserDepot(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
- HttpServletRequest request) {
- JSONArray arr = new JSONArray();
- try {
- List dataList = depotService.findUserDepot();
- //开始拼接json数据
- JSONObject outer = new JSONObject();
- outer.put("id", 1);
- outer.put("text", "仓库列表");
- outer.put("state", "open");
- //存放数据json数组
- JSONArray dataArray = new JSONArray();
- if (null != dataList) {
- for (Depot depot : dataList) {
- JSONObject item = new JSONObject();
- item.put("id", depot.getId());
- item.put("text", depot.getName());
- //勾选判断1
- Boolean flag = false;
- try {
- flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + depot.getId().toString() + "]");
- } catch (Exception e) {
- logger.error(">>>>>>>>>>>>>>>>>设置用户对应的仓库：类型" + type + " KeyId为： " + keyId + " 存在异常！");
- }
- if (flag == true) {
- item.put("checked", true);
- }
- //结束
- dataArray.add(item);
- }
- }
- outer.put("children", dataArray);
- arr.add(outer);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return arr;
- }
-
- @GetMapping(value = "/findDepotByUserId")
- public JSONArray findDepotByUserId(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
- HttpServletRequest request) {
- JSONArray arr = new JSONArray();
- try {
- List dataList = depotService.findUserDepot();
- //开始拼接json数据
- if (null != dataList) {
- for (Depot depot : dataList) {
- JSONObject item = new JSONObject();
- //勾选判断1
- Boolean flag = false;
- try {
- flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + depot.getId().toString() + "]");
- } catch (DataAccessException e) {
- logger.error(">>>>>>>>>>>>>>>>>查询用户对应的仓库：类型" + type + " KeyId为： " + keyId + " 存在异常！");
- }
- if (flag == true) {
- item.put("id", depot.getId());
- item.put("depotName", depot.getName());
- arr.add(item);
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return arr;
- }
-
- /**
- * 查找礼品卡-虚拟仓库
- * @param type
- * @param request
- * @return
- */
- @PostMapping(value = "/findGiftByType")
- public JSONArray findGiftByType(@RequestParam("type") Integer type,
- HttpServletRequest request) {
- JSONArray arr = new JSONArray();
- try {
- List dataList = depotService.findGiftByType(type);
- //存放数据json数组
- if (null != dataList) {
- for (Depot depot : dataList) {
- JSONObject item = new JSONObject();
- item.put("id", depot.getId());
- //仓库名称
- item.put("name", depot.getName());
- arr.add(item);
- }
- }
- } catch (Exception e) {
- logger.error(">>>>>>>>>查找仓库信息异常", e);
- }
- return arr;
- }
-}
+package com.jsh.erp.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.datasource.entities.Depot;
+import com.jsh.erp.service.depot.DepotService;
+import com.jsh.erp.service.userBusiness.UserBusinessService;
+import com.jsh.erp.utils.BaseResponseInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author ji sheng hua 752*718*920
+ */
+@RestController
+@RequestMapping(value = "/depot")
+public class DepotController {
+ private Logger logger = LoggerFactory.getLogger(DepotController.class);
+
+ @Resource
+ private DepotService depotService;
+
+ @Resource
+ private UserBusinessService userBusinessService;
+
+ @GetMapping(value = "/getAllList")
+ public BaseResponseInfo getAllList(HttpServletRequest request) {
+ BaseResponseInfo res = new BaseResponseInfo();
+ try {
+ List depotList = depotService.getAllList();
+ res.code = 200;
+ res.data = depotList;
+ } catch(Exception e){
+ e.printStackTrace();
+ res.code = 500;
+ res.data = "获取数据失败";
+ }
+ return res;
+ }
+
+ /**
+ * 用户对应仓库显示
+ * @param type
+ * @param keyId
+ * @param request
+ * @return
+ */
+ @PostMapping(value = "/findUserDepot")
+ public JSONArray findUserDepot(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
+ HttpServletRequest request) {
+ JSONArray arr = new JSONArray();
+ try {
+ List dataList = depotService.findUserDepot();
+ //开始拼接json数据
+ JSONObject outer = new JSONObject();
+ outer.put("id", 1);
+ outer.put("text", "仓库列表");
+ outer.put("state", "open");
+ //存放数据json数组
+ JSONArray dataArray = new JSONArray();
+ if (null != dataList) {
+ for (Depot depot : dataList) {
+ JSONObject item = new JSONObject();
+ item.put("id", depot.getId());
+ item.put("text", depot.getName());
+ //勾选判断1
+ Boolean flag = false;
+ try {
+ flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + depot.getId().toString() + "]");
+ } catch (Exception e) {
+ logger.error(">>>>>>>>>>>>>>>>>设置用户对应的仓库：类型" + type + " KeyId为： " + keyId + " 存在异常！");
+ }
+ if (flag == true) {
+ item.put("checked", true);
+ }
+ //结束
+ dataArray.add(item);
+ }
+ }
+ outer.put("children", dataArray);
+ arr.add(outer);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return arr;
+ }
+
+ @RequestMapping(value = "/findDepotByUserId")
+ public JSONArray findDepotByUserId(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
+ HttpServletRequest request) {
+ JSONArray arr = new JSONArray();
+ try {
+ List dataList = depotService.findUserDepot();
+ //开始拼接json数据
+ if (null != dataList) {
+ for (Depot depot : dataList) {
+ JSONObject item = new JSONObject();
+ //勾选判断1
+ Boolean flag = false;
+ try {
+ flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + depot.getId().toString() + "]");
+ } catch (DataAccessException e) {
+ logger.error(">>>>>>>>>>>>>>>>>查询用户对应的仓库：类型" + type + " KeyId为： " + keyId + " 存在异常！");
+ }
+ if (flag == true) {
+ item.put("id", depot.getId());
+ item.put("depotName", depot.getName());
+ arr.add(item);
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return arr;
+ }
+
+ /**
+ * 查找礼品卡-虚拟仓库
+ * @param type
+ * @param request
+ * @return
+ */
+ @RequestMapping(value = "/findGiftByType")
+ public JSONArray findGiftByType(@RequestParam("type") Integer type,
+ HttpServletRequest request) {
+ JSONArray arr = new JSONArray();
+ try {
+ List dataList = depotService.findGiftByType(type);
+ //存放数据json数组
+ if (null != dataList) {
+ for (Depot depot : dataList) {
+ JSONObject item = new JSONObject();
+ item.put("id", depot.getId());
+ //仓库名称
+ item.put("name", depot.getName());
+ arr.add(item);
+ }
+ }
+ } catch (Exception e) {
+ logger.error(">>>>>>>>>查找仓库信息异常", e);
+ }
+ return arr;
+ }
+}
diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java
index 28e21a2d..f0e8d2e9 100644
--- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java
@@ -2,6 +2,7 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
@@ -464,5 +465,75 @@ public class DepotHeadController {
}
return allMoney;
}
+ /**
+ * create by: cjl
+ * description:
+ * 新增单据主表及单据子表信息
+ * create time: 2019/1/25 14:36
+ * @Param: beanJson
+ * @Param: inserted
+ * @Param: deleted
+ * @Param: updated
+ * @return java.lang.String
+ */
+ @RequestMapping(value = "/addDepotHeadAndDetail")
+ public Object addDepotHeadAndDetail(@RequestParam("info") String beanJson,@RequestParam("inserted") String inserted,
+ @RequestParam("deleted") String deleted,
+ @RequestParam("updated") String updated) throws Exception{
+ JSONObject result = ExceptionConstants.standardSuccess();
+ depotHeadService.addDepotHeadAndDetail(beanJson,inserted,deleted,updated);
+ return result;
+ }
+ /**
+ * create by: cjl
+ * description:
+ * 更新单据主表及单据子表信息
+ * create time: 2019/1/28 14:47
+ * @Param: id
+ * @Param: beanJson
+ * @Param: inserted
+ * @Param: deleted
+ * @Param: updated
+ * @Param: preTotalPrice
+ * @return java.lang.Object
+ */
+ @RequestMapping(value = "/updateDepotHeadAndDetail")
+ public Object updateDepotHeadAndDetail(@RequestParam("id") Long id,@RequestParam("info") String beanJson,@RequestParam("inserted") String inserted,
+ @RequestParam("deleted") String deleted,
+ @RequestParam("updated") String updated,@RequestParam("preTotalPrice") BigDecimal preTotalPrice) throws Exception{
+ JSONObject result = ExceptionConstants.standardSuccess();
+ depotHeadService.updateDepotHeadAndDetail(id,beanJson,inserted,deleted,updated,preTotalPrice);
+ return result;
+ }
+ /**
+ * create by: cjl
+ * description:
+ * 删除单据主表及子表信息
+ * create time: 2019/1/28 17:29
+ * @Param: id
+ * @return java.lang.Object
+ */
+ @RequestMapping(value = "/deleteDepotHeadAndDetail")
+ public Object deleteDepotHeadAndDetail(@RequestParam("id") Long id) throws Exception{
+
+ JSONObject result = ExceptionConstants.standardSuccess();
+ depotHeadService.deleteDepotHeadAndDetail(id);
+ return result;
+ }
+ /**
+ * create by: cjl
+ * description:
+ * 删除单据主表及子表信息
+ * create time: 2019/1/28 17:29
+ * @Param: id
+ * @return java.lang.Object
+ */
+ @RequestMapping(value = "/batchDeleteDepotHeadAndDetail")
+ public Object batchDeleteDepotHeadAndDetail(@RequestParam("ids") String ids) throws Exception{
+
+ JSONObject result = ExceptionConstants.standardSuccess();
+ depotHeadService.batchDeleteDepotHeadAndDetail(ids);
+ return result;
+ }
}
diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 16c776e2..99aedefc 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -262,7 +262,7 @@ public class DepotItemController {
@RequestParam("deleted") String deleted,
@RequestParam("updated") String updated,
@RequestParam("headerId") Long headerId,
- HttpServletRequest request) {
+ HttpServletRequest request) throws Exception{
Map objectMap = new HashMap();
try {
depotItemService.saveDetials(inserted,deleted,updated,headerId);
diff --git a/src/main/java/com/jsh/erp/controller/SupplierController.java b/src/main/java/com/jsh/erp/controller/SupplierController.java
index 81255fe7..e7b1e1ab 100644
--- a/src/main/java/com/jsh/erp/controller/SupplierController.java
+++ b/src/main/java/com/jsh/erp/controller/SupplierController.java
@@ -176,7 +176,12 @@ public class SupplierController {
item.put("AdvanceIn", supplier.getAdvancein());
item.put("BeginNeedGet", supplier.getBeginneedget());
item.put("BeginNeedPay", supplier.getBeginneedpay());
- item.put("isystem", supplier.getIsystem() == (short) 0 ? "是" : "否");
+ /**
+ * 2018-01-28这里会有空指针异常
+ * */
+ if(supplier.getIsystem()!=null){
+ item.put("isystem", supplier.getIsystem() == (short) 0 ? "是" : "否");
+ }
item.put("description", supplier.getDescription());
item.put("fax", supplier.getFax());
item.put("telephone", supplier.getTelephone());
diff --git a/src/main/java/com/jsh/erp/datasource/entities/Material.java b/src/main/java/com/jsh/erp/datasource/entities/Material.java
index f21c6adf..e7d2f0f1 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/Material.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/Material.java
@@ -190,7 +190,7 @@ public class Material {
* 2019-01-21新增字段enableSerialNumber
*是否开启序列号
* */
- private Boolean enableSerialNumber;
+ private String enableSerialNumber;
/**
* This method was generated by MyBatis Generator.
@@ -744,11 +744,11 @@ public class Material {
this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
}
- public Boolean getEnableSerialNumber() {
+ public String getEnableSerialNumber() {
return enableSerialNumber;
}
- public void setEnableSerialNumber(Boolean enableSerialNumber) {
+ public void setEnableSerialNumber(String enableSerialNumber) {
this.enableSerialNumber = enableSerialNumber;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java b/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
index f962828e..e74d0a68 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
@@ -1704,6 +1704,72 @@ public class MaterialExample {
addCriterion("OtherField3 not between", value1, value2, "otherfield3");
return (Criteria) this;
}
+ public Criteria andEnableSerialNumberIsNull() {
+ addCriterion("enableSerialNumber is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberIsNotNull() {
+ addCriterion("enableSerialNumber is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberEqualTo(String value) {
+ addCriterion("enableSerialNumber =", value, "enableSerialNumber");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberNotEqualTo(String value) {
+ addCriterion("enableSerialNumber <>", value, "enableSerialNumber");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberGreaterThan(String value) {
+ addCriterion("enableSerialNumber >", value, "enableSerialNumber");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberGreaterThanOrEqualTo(String value) {
+ addCriterion("enableSerialNumber >=", value, "enableSerialNumber");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberLessThan(String value) {
+ addCriterion("enableSerialNumber <", value, "enableSerialNumber");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberLessThanOrEqualTo(String value) {
+ addCriterion("enableSerialNumber <=", value, "enableSerialNumber");
+ return (Criteria) this;
+ }
+ public Criteria andEnableSerialNumberLike(String value) {
+ addCriterion("enableSerialNumber like", value, "enableSerialNumber");
+ return (Criteria) this;
+ }
+ public Criteria andEnableSerialNumberNotLike(String value) {
+ addCriterion("enableSerialNumber not like", value, "enableSerialNumber");
+ return (Criteria) this;
+ }
+ public Criteria andEnableSerialNumberIn(List values) {
+ addCriterion("enableSerialNumber in", values, "enableSerialNumber");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberNotIn(List values) {
+ addCriterion("enableSerialNumber not in", values, "enableSerialNumber");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberBetween(String value1, String value2) {
+ addCriterion("enableSerialNumber between", value1, value2, "enableSerialNumber");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnableSerialNumberNotBetween(String value1, String value2) {
+ addCriterion("enableSerialNumber not between", value1, value2, "enableSerialNumber");
+ return (Criteria) this;
+ }
}
/**
diff --git a/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java b/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
index 521442a7..47101015 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
@@ -59,7 +59,7 @@ public class MaterialVo4Unit {
* 2019-01-21新增字段enableSerialNumber
*是否开启序列号
* */
- private Boolean enableSerialNumber;
+ private String enableSerialNumber;
public Long getId() {
return id;
@@ -269,11 +269,11 @@ public class MaterialVo4Unit {
this.materialOther = materialOther;
}
- public Boolean getEnableSerialNumber() {
+ public String getEnableSerialNumber() {
return enableSerialNumber;
}
- public void setEnableSerialNumber(Boolean enableSerialNumber) {
+ public void setEnableSerialNumber(String enableSerialNumber) {
this.enableSerialNumber = enableSerialNumber;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java b/src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java
index 63b14de6..e00648cc 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java
@@ -33,7 +33,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
- private Boolean isSell;
+ private String isSell;
/**
* This field was generated by MyBatis Generator.
@@ -49,7 +49,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
- private Boolean deleteFlag;
+ private String deleteFlag;
/**
* This field was generated by MyBatis Generator.
@@ -82,6 +82,10 @@ public class SerialNumber {
* @mbggenerated
*/
private Long updater;
+ /**
+ * 单据主表id，用于跟踪序列号流向
+ * */
+ private Long depotheadId;
/**
* This method was generated by MyBatis Generator.
@@ -163,7 +167,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
- public Boolean getIsSell() {
+ public String getIsSell() {
return isSell;
}
@@ -175,7 +179,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
- public void setIsSell(Boolean isSell) {
+ public void setIsSell(String isSell) {
this.isSell = isSell;
}
@@ -211,7 +215,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
- public Boolean getDeleteFlag() {
+ public String getDeleteFlag() {
return deleteFlag;
}
@@ -223,7 +227,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
- public void setDeleteFlag(Boolean deleteFlag) {
+ public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag;
}
@@ -322,4 +326,13 @@ public class SerialNumber {
public void setUpdater(Long updater) {
this.updater = updater;
}
+
+
+ public Long getDepotheadId() {
+ return depotheadId;
+ }
+
+ public void setDepotheadId(Long depotheadId) {
+ this.depotheadId = depotheadId;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java b/src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java
index 10abeed2..33006783 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java
@@ -395,52 +395,61 @@ public class SerialNumberExample {
return (Criteria) this;
}
- public Criteria andIsSellEqualTo(Boolean value) {
+ public Criteria andIsSellEqualTo(String value) {
addCriterion("is_Sell =", value, "isSell");
return (Criteria) this;
}
- public Criteria andIsSellNotEqualTo(Boolean value) {
+ public Criteria andIsSellNotEqualTo(String value) {
addCriterion("is_Sell <>", value, "isSell");
return (Criteria) this;
}
- public Criteria andIsSellGreaterThan(Boolean value) {
+ public Criteria andIsSellGreaterThan(String value) {
addCriterion("is_Sell >", value, "isSell");
return (Criteria) this;
}
- public Criteria andIsSellGreaterThanOrEqualTo(Boolean value) {
+ public Criteria andIsSellGreaterThanOrEqualTo(String value) {
addCriterion("is_Sell >=", value, "isSell");
return (Criteria) this;
}
- public Criteria andIsSellLessThan(Boolean value) {
+ public Criteria andIsSellLessThan(String value) {
addCriterion("is_Sell <", value, "isSell");
return (Criteria) this;
}
- public Criteria andIsSellLessThanOrEqualTo(Boolean value) {
+ public Criteria andIsSellLessThanOrEqualTo(String value) {
addCriterion("is_Sell <=", value, "isSell");
return (Criteria) this;
}
- public Criteria andIsSellIn(List values) {
+ public Criteria andIsSellLike(String value) {
+ addCriterion("isSell like", value, "isSell");
+ return (Criteria) this;
+ }
+ public Criteria andIsSellNotLike(String value) {
+ addCriterion("isSell not like", value, "isSell");
+ return (Criteria) this;
+ }
+
+ public Criteria andIsSellIn(List values) {
addCriterion("is_Sell in", values, "isSell");
return (Criteria) this;
}
- public Criteria andIsSellNotIn(List values) {
+ public Criteria andIsSellNotIn(List values) {
addCriterion("is_Sell not in", values, "isSell");
return (Criteria) this;
}
- public Criteria andIsSellBetween(Boolean value1, Boolean value2) {
+ public Criteria andIsSellBetween(String value1, String value2) {
addCriterion("is_Sell between", value1, value2, "isSell");
return (Criteria) this;
}
- public Criteria andIsSellNotBetween(Boolean value1, Boolean value2) {
+ public Criteria andIsSellNotBetween(String value1, String value2) {
addCriterion("is_Sell not between", value1, value2, "isSell");
return (Criteria) this;
}
@@ -525,52 +534,59 @@ public class SerialNumberExample {
return (Criteria) this;
}
- public Criteria andDeleteFlagEqualTo(Boolean value) {
+ public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag");
return (Criteria) this;
}
- public Criteria andDeleteFlagNotEqualTo(Boolean value) {
+ public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag");
return (Criteria) this;
}
- public Criteria andDeleteFlagGreaterThan(Boolean value) {
+ public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag");
return (Criteria) this;
}
- public Criteria andDeleteFlagGreaterThanOrEqualTo(Boolean value) {
+ public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag");
return (Criteria) this;
}
- public Criteria andDeleteFlagLessThan(Boolean value) {
+ public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag");
return (Criteria) this;
}
- public Criteria andDeleteFlagLessThanOrEqualTo(Boolean value) {
+ public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag");
return (Criteria) this;
}
-
- public Criteria andDeleteFlagIn(List values) {
+ public Criteria andDeleteFlagLike(String value) {
+ addCriterion("deleteFlag like", value, "deleteFlag");
+ return (Criteria) this;
+ }
+ public Criteria andDeleteFlagNotLike(String value) {
+ addCriterion("deleteFlag not like", value, "deleteFlag");
+ return (Criteria) this;
+ }
+ public Criteria andDeleteFlagIn(List values) {
addCriterion("delete_Flag in", values, "deleteFlag");
return (Criteria) this;
}
- public Criteria andDeleteFlagNotIn(List values) {
+ public Criteria andDeleteFlagNotIn(List values) {
addCriterion("delete_Flag not in", values, "deleteFlag");
return (Criteria) this;
}
- public Criteria andDeleteFlagBetween(Boolean value1, Boolean value2) {
+ public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
return (Criteria) this;
}
- public Criteria andDeleteFlagNotBetween(Boolean value1, Boolean value2) {
+ public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
return (Criteria) this;
}
@@ -814,6 +830,68 @@ public class SerialNumberExample {
addCriterion("updater not between", value1, value2, "updater");
return (Criteria) this;
}
+ public Criteria andDepotheadIdIsNull() {
+ addCriterion("depotheadId is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdIsNotNull() {
+ addCriterion("depotheadId is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdEqualTo(Long value) {
+ addCriterion("depotheadId =", value, "depotheadId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdNotEqualTo(Long value) {
+ addCriterion("depotheadId <>", value, "depotheadId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdGreaterThan(Long value) {
+ addCriterion("depotheadId >", value, "depotheadId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdGreaterThanOrEqualTo(Long value) {
+ addCriterion("depotheadId >=", value, "depotheadId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdLessThan(Long value) {
+ addCriterion("depotheadId <", value, "depotheadId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdLessThanOrEqualTo(Long value) {
+ addCriterion("depotheadId <=", value, "depotheadId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdIn(List values) {
+ addCriterion("depotheadId in", values, "depotheadId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdNotIn(List values) {
+ addCriterion("depotheadId not in", values, "depotheadId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdBetween(Long value1, Long value2) {
+ addCriterion("depotheadId between", value1, value2, "depotheadId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDepotheadIdNotBetween(Long value1, Long value2) {
+ addCriterion("depotheadId not between", value1, value2, "depotheadId");
+ return (Criteria) this;
+ }
+
+
+
}
/**
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
index 3d620fac..73f99835 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
@@ -101,87 +101,6 @@ public interface DepotHeadMapper {
*/
int updateByPrimaryKey(DepotHead record);
- List selectByConditionDepotHead(
- @Param("type") String type,
- @Param("subType") String subType,
- @Param("number") String number,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("dhIds") String dhIds,
- @Param("offset") Integer offset,
- @Param("rows") Integer rows);
- int countsByDepotHead(
- @Param("type") String type,
- @Param("subType") String subType,
- @Param("number") String number,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("dhIds") String dhIds);
-
- Long getMaxId();
-
- String findMaterialsListByHeaderId(
- @Param("id") Long id);
-
- List findByAll(
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("type") String type,
- @Param("pid") Integer pid,
- @Param("dids") String dids,
- @Param("oId") Integer oId,
- @Param("offset") Integer offset,
- @Param("rows") Integer rows);
-
- int findByAllCount(
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("type") String type,
- @Param("pid") Integer pid,
- @Param("dids") String dids,
- @Param("oId") Integer oId);
-
- List findInOutMaterialCount(
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("type") String type,
- @Param("pid") Integer pid,
- @Param("dids") String dids,
- @Param("oId") Integer oId,
- @Param("offset") Integer offset,
- @Param("rows") Integer rows);
-
- int findInOutMaterialCountTotal(
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("type") String type,
- @Param("pid") Integer pid,
- @Param("dids") String dids,
- @Param("oId") Integer oId);
-
- List findStatementAccount(
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("organId") Integer organId,
- @Param("supType") String supType,
- @Param("offset") Integer offset,
- @Param("rows") Integer rows);
-
- int findStatementAccountCount(
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("organId") Integer organId,
- @Param("supType") String supType);
-
- BigDecimal findAllMoney(
- @Param("supplierId") Integer supplierId,
- @Param("type") String type,
- @Param("subType") String subType,
- @Param("modeName") String modeName,
- @Param("endTime") String endTime);
-
- List getDetailByNumber(
- @Param("number") String number);
}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
new file mode 100644
index 00000000..4e5faaa1
--- /dev/null
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
@@ -0,0 +1,110 @@
+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.DepotHead;
+import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
+import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
+import com.jsh.erp.datasource.vo.DepotHeadVo4List;
+import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @Author: cjl
+ * @Date: 2019/1/25 14:50
+ */
+public interface DepotHeadMapperEx {
+ List selectByConditionDepotHead(
+ @Param("type") String type,
+ @Param("subType") String subType,
+ @Param("number") String number,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("dhIds") String dhIds,
+ @Param("offset") Integer offset,
+ @Param("rows") Integer rows);
+
+ int countsByDepotHead(
+ @Param("type") String type,
+ @Param("subType") String subType,
+ @Param("number") String number,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("dhIds") String dhIds);
+
+ Long getMaxId();
+
+ String findMaterialsListByHeaderId(
+ @Param("id") Long id);
+
+ List findByAll(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("type") String type,
+ @Param("pid") Integer pid,
+ @Param("dids") String dids,
+ @Param("oId") Integer oId,
+ @Param("offset") Integer offset,
+ @Param("rows") Integer rows);
+
+ int findByAllCount(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("type") String type,
+ @Param("pid") Integer pid,
+ @Param("dids") String dids,
+ @Param("oId") Integer oId);
+
+ List findInOutMaterialCount(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("type") String type,
+ @Param("pid") Integer pid,
+ @Param("dids") String dids,
+ @Param("oId") Integer oId,
+ @Param("offset") Integer offset,
+ @Param("rows") Integer rows);
+
+ int findInOutMaterialCountTotal(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("type") String type,
+ @Param("pid") Integer pid,
+ @Param("dids") String dids,
+ @Param("oId") Integer oId);
+
+ List findStatementAccount(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("organId") Integer organId,
+ @Param("supType") String supType,
+ @Param("offset") Integer offset,
+ @Param("rows") Integer rows);
+
+ int findStatementAccountCount(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("organId") Integer organId,
+ @Param("supType") String supType);
+
+ BigDecimal findAllMoney(
+ @Param("supplierId") Integer supplierId,
+ @Param("type") String type,
+ @Param("subType") String subType,
+ @Param("modeName") String modeName,
+ @Param("endTime") String endTime);
+
+ List getDetailByNumber(
+ @Param("number") String number);
+ /**
+ * 新增单据主表信息，并反显单据主表id
+ * */
+ int adddepotHead(DepotHead depotHead);
+ /**
+ * 更新单据主表信息
+ * */
+ void updatedepotHead(DepotHead depotHead);
+}
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java
index 1ff4939f..484f0293 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java
@@ -96,123 +96,6 @@ public interface DepotItemMapper {
*/
int updateByPrimaryKey(DepotItem record);
- List selectByConditionDepotItem(
- @Param("name") String name,
- @Param("type") Integer type,
- @Param("remark") String remark,
- @Param("offset") Integer offset,
- @Param("rows") Integer rows);
- int countsByDepotItem(
- @Param("name") String name,
- @Param("type") Integer type,
- @Param("remark") String remark);
-
- List getHeaderIdByMaterial(
- @Param("materialParam") String materialParam,
- @Param("depotIds") String depotIds);
-
- List findDetailByTypeAndMaterialIdList(
- @Param("mId") Long mId,
- @Param("offset") Integer offset,
- @Param("rows") Integer rows);
-
- int findDetailByTypeAndMaterialIdCounts(
- @Param("mId") Long mId);
-
- List findStockNumByMaterialIdList(
- @Param("mId") Long mId,
- @Param("monthTime") String monthTime,
- @Param("offset") Integer offset,
- @Param("rows") Integer rows);
-
- int findStockNumByMaterialIdCounts(
- @Param("mId") Long mId,
- @Param("monthTime") String monthTime);
-
- int findByTypeAndMaterialIdIn(
- @Param("mId") Long mId);
-
- int findByTypeAndMaterialIdOut(
- @Param("mId") Long mId);
-
- List getDetailList(
- @Param("headerId") Long headerId);
-
- List findByAll(
- @Param("headIds") String headIds,
- @Param("materialIds") String materialIds,
- @Param("offset") Integer offset,
- @Param("rows") Integer rows);
-
- int findByAllCount(
- @Param("headIds") String headIds,
- @Param("materialIds") String materialIds);
-
- BigDecimal findByTypeInIsPrev(
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime);
-
- BigDecimal findByTypeInIsNotPrev(
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime);
-
- BigDecimal findByTypeOutIsPrev(
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime);
-
- BigDecimal findByTypeOutIsNotPrev(
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime);
-
-
-
- BigDecimal findPriceByTypeInIsPrev(
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime);
-
- BigDecimal findPriceByTypeInIsNotPrev(
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime);
-
- BigDecimal findPriceByTypeOutIsPrev(
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime);
-
- BigDecimal findPriceByTypeOutIsNotPrev(
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime);
-
- BigDecimal buyOrSaleNumber(
- @Param("type") String type,
- @Param("subType") String subType,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime,
- @Param("sumType") String sumType);
-
- BigDecimal buyOrSalePrice(
- @Param("type") String type,
- @Param("subType") String subType,
- @Param("MId") Long MId,
- @Param("MonthTime") String MonthTime,
- @Param("sumType") String sumType);
-
- BigDecimal findGiftByTypeIn(
- @Param("subType") String subType,
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId);
-
- BigDecimal findGiftByTypeOut(
- @Param("subType") String subType,
- @Param("ProjectId") Integer ProjectId,
- @Param("MId") Long MId);
}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
new file mode 100644
index 00000000..4c71049d
--- /dev/null
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
@@ -0,0 +1,148 @@
+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.*;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @Author: cjl
+ * @Date: 2019/1/24 16:59
+ */
+public interface DepotItemMapperEx {
+ List selectByConditionDepotItem(
+ @Param("name") String name,
+ @Param("type") Integer type,
+ @Param("remark") String remark,
+ @Param("offset") Integer offset,
+ @Param("rows") Integer rows);
+
+ int countsByDepotItem(
+ @Param("name") String name,
+ @Param("type") Integer type,
+ @Param("remark") String remark);
+
+ List getHeaderIdByMaterial(
+ @Param("materialParam") String materialParam,
+ @Param("depotIds") String depotIds);
+
+ List findDetailByTypeAndMaterialIdList(
+ @Param("mId") Long mId,
+ @Param("offset") Integer offset,
+ @Param("rows") Integer rows);
+
+ int findDetailByTypeAndMaterialIdCounts(
+ @Param("mId") Long mId);
+
+ List findStockNumByMaterialIdList(
+ @Param("mId") Long mId,
+ @Param("monthTime") String monthTime,
+ @Param("offset") Integer offset,
+ @Param("rows") Integer rows);
+
+ int findStockNumByMaterialIdCounts(
+ @Param("mId") Long mId,
+ @Param("monthTime") String monthTime);
+
+ int findByTypeAndMaterialIdIn(
+ @Param("mId") Long mId);
+
+ int findByTypeAndMaterialIdOut(
+ @Param("mId") Long mId);
+
+ List getDetailList(
+ @Param("headerId") Long headerId);
+
+ List findByAll(
+ @Param("headIds") String headIds,
+ @Param("materialIds") String materialIds,
+ @Param("offset") Integer offset,
+ @Param("rows") Integer rows);
+
+ int findByAllCount(
+ @Param("headIds") String headIds,
+ @Param("materialIds") String materialIds);
+
+ BigDecimal findByTypeInIsPrev(
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime);
+
+ BigDecimal findByTypeInIsNotPrev(
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime);
+
+ BigDecimal findByTypeOutIsPrev(
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime);
+
+ BigDecimal findByTypeOutIsNotPrev(
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime);
+
+
+
+ BigDecimal findPriceByTypeInIsPrev(
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime);
+
+ BigDecimal findPriceByTypeInIsNotPrev(
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime);
+
+ BigDecimal findPriceByTypeOutIsPrev(
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime);
+
+ BigDecimal findPriceByTypeOutIsNotPrev(
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime);
+
+ BigDecimal buyOrSaleNumber(
+ @Param("type") String type,
+ @Param("subType") String subType,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime,
+ @Param("sumType") String sumType);
+
+ BigDecimal buyOrSalePrice(
+ @Param("type") String type,
+ @Param("subType") String subType,
+ @Param("MId") Long MId,
+ @Param("MonthTime") String MonthTime,
+ @Param("sumType") String sumType);
+
+ BigDecimal findGiftByTypeIn(
+ @Param("subType") String subType,
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId);
+
+ BigDecimal findGiftByTypeOut(
+ @Param("subType") String subType,
+ @Param("ProjectId") Integer ProjectId,
+ @Param("MId") Long MId);
+ /**
+ * create by: cjl
+ * description:
+ * 通过单据主表id查询所有单据子表数据
+ * create time: 2019/1/24 16:56
+ * @Param: depotheadId
+ * @return java.util.List
+ */
+ List findDepotItemListBydepotheadId(@Param("depotheadId")Long depotheadId,
+ @Param("enableSerialNumber")String enableSerialNumber);
+ /**
+ * 根据单据主表id删除单据子表数据
+ * */
+ int deleteDepotItemByDepotHeadIds(@Param("depotheadIds")Long []depotHeadIds);
+}
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java
index b8b4276d..05621c9b 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java
@@ -1,9 +1,9 @@
package com.jsh.erp.datasource.mappers;
-import com.jsh.erp.datasource.entities.SerialNumber;
import com.jsh.erp.datasource.entities.SerialNumberEx;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
/**
@@ -42,4 +42,19 @@ public interface SerialNumberMapperEx {
* 未删除为卖出的视为有效
* */
int findSerialNumberByMaterialId(@Param("materialId") Long materialId);
+ /**
+ * 查询符合条件的序列号数量
+ * */
+ int countSerialNumberByMaterialIdAndDepotheadId(@Param("materialId")Long materialId, @Param("depotheadId")Long depotheadId, @Param("isSell")String isSell);
+ /**
+ * 卖出： update jsh_serial_number set is_Sell='1' ,depothead_Id='depotheadId' where 1=1 and material_Id='materialId'
+ * and is_Sell !='1' and delete_Flag !='1' {limit 0，count}
+ * */
+ int sellSerialNumber(@Param("materialId")Long materialId, @Param("depotheadId")Long depotheadId,@Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater);
+ /**
+ * 赎回：update jsh_serial_number set is_Sell='0' where 1=1 and material_Id='materialId'
+ * and depothead_Id='depotheadId' and is_Sell ！='0' and delete_Flag !='1' {limit 0，count}
+ * */
+ int cancelSerialNumber(@Param("materialId")Long materialId, @Param("depotheadId")Long depotheadId, @Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater);
+
}
diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 2c951165..d282c4bb 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -2,14 +2,22 @@ package com.jsh.erp.service.depotHead;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample;
+import com.jsh.erp.datasource.entities.DepotItem;
import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.mappers.DepotHeadMapper;
+import com.jsh.erp.datasource.mappers.DepotHeadMapperEx;
+import com.jsh.erp.datasource.mappers.DepotItemMapperEx;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
import com.jsh.erp.datasource.vo.DepotHeadVo4List;
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
+import com.jsh.erp.service.depotItem.DepotItemService;
+import com.jsh.erp.service.serialNumber.SerialNumberService;
+import com.jsh.erp.service.supplier.SupplierService;
+import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,6 +41,19 @@ public class DepotHeadService {
@Resource
private DepotHeadMapper depotHeadMapper;
+ @Resource
+ private DepotHeadMapperEx depotHeadMapperEx;
+ @Resource
+ private UserService userService;
+ @Resource
+ DepotItemService depotItemService;
+ @Resource
+ private SupplierService supplierService;
+ @Resource
+ private SerialNumberService serialNumberService;
+ @Resource
+ DepotItemMapperEx depotItemMapperEx;
+
public DepotHead getDepotHead(long id) {
return depotHeadMapper.selectByPrimaryKey(id);
@@ -45,7 +66,7 @@ public class DepotHeadService {
public List select(String type, String subType, String number, String beginTime, String endTime, String dhIds, int offset, int rows) {
List resList = new ArrayList();
- List list = depotHeadMapper.selectByConditionDepotHead(type, subType, number, beginTime, endTime, dhIds, offset, rows);
+ List list = depotHeadMapperEx.selectByConditionDepotHead(type, subType, number, beginTime, endTime, dhIds, offset, rows);
if (null != list) {
for (DepotHeadVo4List dh : list) {
if(dh.getOthermoneylist() != null) {
@@ -73,7 +94,7 @@ public class DepotHeadService {
public int countDepotHead(String type, String subType, String number, String beginTime, String endTime, String dhIds) {
- return depotHeadMapper.countsByDepotHead(type, subType, number, beginTime, endTime, dhIds);
+ return depotHeadMapperEx.countsByDepotHead(type, subType, number, beginTime, endTime, dhIds);
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
@@ -169,11 +190,11 @@ public class DepotHeadService {
}
public Long getMaxId() {
- return depotHeadMapper.getMaxId();
+ return depotHeadMapperEx.getMaxId();
}
public String findMaterialsListByHeaderId(Long id) {
- String allReturn = depotHeadMapper.findMaterialsListByHeaderId(id);
+ String allReturn = depotHeadMapperEx.findMaterialsListByHeaderId(id);
return allReturn;
}
@@ -194,27 +215,27 @@ public class DepotHeadService {
}
public List findByAll(String beginTime, String endTime, String type, Integer pid, String dids, Integer oId, Integer offset, Integer rows) {
- return depotHeadMapper.findByAll(beginTime, endTime, type, pid, dids, oId, offset, rows);
+ return depotHeadMapperEx.findByAll(beginTime, endTime, type, pid, dids, oId, offset, rows);
}
public int findByAllCount(String beginTime, String endTime, String type, Integer pid, String dids, Integer oId) {
- return depotHeadMapper.findByAllCount(beginTime, endTime, type, pid, dids, oId);
+ return depotHeadMapperEx.findByAllCount(beginTime, endTime, type, pid, dids, oId);
}
public List findInOutMaterialCount(String beginTime, String endTime, String type, Integer pid, String dids, Integer oId, Integer offset, Integer rows) {
- return depotHeadMapper.findInOutMaterialCount(beginTime, endTime, type, pid, dids, oId, offset, rows);
+ return depotHeadMapperEx.findInOutMaterialCount(beginTime, endTime, type, pid, dids, oId, offset, rows);
}
public int findInOutMaterialCountTotal(String beginTime, String endTime, String type, Integer pid, String dids, Integer oId) {
- return depotHeadMapper.findInOutMaterialCountTotal(beginTime, endTime, type, pid, dids, oId);
+ return depotHeadMapperEx.findInOutMaterialCountTotal(beginTime, endTime, type, pid, dids, oId);
}
public List findStatementAccount(String beginTime, String endTime, Integer organId, String supType, Integer offset, Integer rows) {
- return depotHeadMapper.findStatementAccount(beginTime, endTime, organId, supType, offset, rows);
+ return depotHeadMapperEx.findStatementAccount(beginTime, endTime, organId, supType, offset, rows);
}
public int findStatementAccountCount(String beginTime, String endTime, Integer organId, String supType) {
- return depotHeadMapper.findStatementAccountCount(beginTime, endTime, organId, supType);
+ return depotHeadMapperEx.findStatementAccountCount(beginTime, endTime, organId, supType);
}
public BigDecimal findAllMoney(Integer supplierId, String type, String subType, String mode, String endTime) {
@@ -224,12 +245,12 @@ public class DepotHeadService {
} else if (mode.equals("合计")) {
modeName = "DiscountLastMoney";
}
- return depotHeadMapper.findAllMoney(supplierId, type, subType, modeName, endTime);
+ return depotHeadMapperEx.findAllMoney(supplierId, type, subType, modeName, endTime);
}
public List getDetailByNumber(String number) {
List resList = new ArrayList();
- List list = depotHeadMapper.getDetailByNumber(number);
+ List list = depotHeadMapperEx.getDetailByNumber(number);
if (null != list) {
for (DepotHeadVo4List dh : list) {
if(dh.getOthermoneylist() != null) {
@@ -254,4 +275,115 @@ public class DepotHeadService {
return resList;
}
+ /**
+ * create by: cjl
+ * description:
+ * 新增单据主表及单据子表信息
+ * create time: 2019/1/25 14:36
+ * @Param: beanJson
+ * @Param: inserted
+ * @Param: deleted
+ * @Param: updated
+ * @return java.lang.String
+ */
+ @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+ public void addDepotHeadAndDetail(String beanJson, String inserted, String deleted, String updated) throws Exception {
+ /**处理单据主表数据*/
+ DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
+ //判断用户是否已经登录过，登录过不再处理
+ User userInfo=userService.getCurrentUser();
+ depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
+ depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
+ depotHead.setStatus(false);
+ depotHeadMapperEx.adddepotHead(depotHead);
+
+ /**入库和出库处理预付款信息*/
+ if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
+ if(depotHead.getOrganid()!=null) {
+ supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice()));
+ }
+ }
+ /**入库和出库处理单据子表信息*/
+ depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId());
+ }
+ /**
+ * create by: cjl
+ * description:
+ * 更新单据主表及单据子表信息
+ * create time: 2019/1/28 14:47
+ * @Param: id
+ * @Param: beanJson
+ * @Param: inserted
+ * @Param: deleted
+ * @Param: updated
+ * @Param: preTotalPrice
+ * @return java.lang.Object
+ */
+ @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+ public void updateDepotHeadAndDetail(Long id, String beanJson, String inserted, String deleted, String updated, BigDecimal preTotalPrice)throws Exception {
+ /**更新单据主表信息*/
+ DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
+ //判断用户是否已经登录过，登录过不再处理
+ depotHead.setId(id);
+ User userInfo=userService.getCurrentUser();
+ depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
+ depotHead.setOpertime(new Timestamp(System.currentTimeMillis()));
+ depotHeadMapperEx.updatedepotHead(depotHead);
+ /**入库和出库处理预付款信息*/
+ if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
+ if(depotHead.getOrganid()!=null){
+ supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice().subtract(preTotalPrice)));
+ }
+ }
+ /**入库和出库处理单据子表信息*/
+ depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId());
+ }
+
+ /**
+ * create by: cjl
+ * description:
+ * 删除单据主表及子表信息
+ * create time: 2019/1/28 17:29
+ * @Param: id
+ * @return java.lang.Object
+ */
+ @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+ public void deleteDepotHeadAndDetail(Long id) throws Exception {
+ //查询单据主表信息
+ DepotHead depotHead =getDepotHead(id);
+ User userInfo=userService.getCurrentUser();
+ //删除出库数据回收序列号
+ if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
+ &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())){
+ //查询单据子表列表
+ List depotItemList = depotItemMapperEx.findDepotItemListBydepotheadId(id,BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED);
+ /**回收序列号*/
+ if(depotItemList!=null&&depotItemList.size()>0){
+ for(DepotItem depotItem:depotItemList){
+ serialNumberService.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(),depotItem.getOpernumber().intValue(),userInfo);
+ }
+ }
+ }
+ /**删除单据子表数据*/
+ depotItemMapperEx.deleteDepotItemByDepotHeadIds(new Long []{id});
+ /**删除单据主表信息*/
+ deleteDepotHead(id);
+ }
+ /**
+ * create by: cjl
+ * description:
+ * 批量删除单据主表及子表信息
+ * create time: 2019/1/28 17:29
+ * @Param: id
+ * @return java.lang.Object
+ */
+ @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+ public void batchDeleteDepotHeadAndDetail(String ids) throws Exception{
+ if(StringUtil.isNotEmpty(ids)){
+ String [] headIds=ids.split(",");
+ for(int i=0;i select(String name, Integer type, String remark, int offset, int rows) {
- return depotItemMapper.selectByConditionDepotItem(name, type, remark, offset, rows);
+ return depotItemMapperEx.selectByConditionDepotItem(name, type, remark, offset, rows);
}
public int countDepotItem(String name, Integer type, String remark) {
- return depotItemMapper.countsByDepotItem(name, type, remark);
+ return depotItemMapperEx.countsByDepotItem(name, type, remark);
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
@@ -87,7 +104,7 @@ public class DepotItemService {
}
public List getHeaderIdByMaterial(String materialParam, String depotIds) {
- return depotItemMapper.getHeaderIdByMaterial(materialParam, depotIds);
+ return depotItemMapperEx.getHeaderIdByMaterial(materialParam, depotIds);
}
public List findDetailByTypeAndMaterialIdList(Map map) {
@@ -96,7 +113,7 @@ public class DepotItemService {
if(!StringUtil.isEmpty(mIdStr)) {
mId = Long.parseLong(mIdStr);
}
- return depotItemMapper.findDetailByTypeAndMaterialIdList(mId, QueryUtils.offset(map), QueryUtils.rows(map));
+ return depotItemMapperEx.findDetailByTypeAndMaterialIdList(mId, QueryUtils.offset(map), QueryUtils.rows(map));
}
public int findDetailByTypeAndMaterialIdCounts(Map map) {
@@ -105,7 +122,7 @@ public class DepotItemService {
if(!StringUtil.isEmpty(mIdStr)) {
mId = Long.parseLong(mIdStr);
}
- return depotItemMapper.findDetailByTypeAndMaterialIdCounts(mId);
+ return depotItemMapperEx.findDetailByTypeAndMaterialIdCounts(mId);
}
public List findStockNumByMaterialIdList(Map map) {
@@ -115,7 +132,7 @@ public class DepotItemService {
mId = Long.parseLong(mIdStr);
}
String monthTime = map.get("monthTime");
- return depotItemMapper.findStockNumByMaterialIdList(mId, monthTime, QueryUtils.offset(map), QueryUtils.rows(map));
+ return depotItemMapperEx.findStockNumByMaterialIdList(mId, monthTime, QueryUtils.offset(map), QueryUtils.rows(map));
}
public int findStockNumByMaterialIdCounts(Map map) {
@@ -125,7 +142,7 @@ public class DepotItemService {
mId = Long.parseLong(mIdStr);
}
String monthTime = map.get("monthTime");
- return depotItemMapper.findStockNumByMaterialIdCounts(mId, monthTime);
+ return depotItemMapperEx.findStockNumByMaterialIdCounts(mId, monthTime);
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
@@ -140,36 +157,36 @@ public class DepotItemService {
public int findByTypeAndMaterialId(String type, Long mId) {
if(type.equals(TYPE)) {
- return depotItemMapper.findByTypeAndMaterialIdIn(mId);
+ return depotItemMapperEx.findByTypeAndMaterialIdIn(mId);
} else {
- return depotItemMapper.findByTypeAndMaterialIdOut(mId);
+ return depotItemMapperEx.findByTypeAndMaterialIdOut(mId);
}
}
public List getDetailList(Long headerId) {
- return depotItemMapper.getDetailList(headerId);
+ return depotItemMapperEx.getDetailList(headerId);
}
public List findByAll(String headIds, String materialIds, Integer offset, Integer rows) {
- return depotItemMapper.findByAll(headIds, materialIds, offset, rows);
+ return depotItemMapperEx.findByAll(headIds, materialIds, offset, rows);
}
public int findByAllCount(String headIds, String materialIds) {
- return depotItemMapper.findByAllCount(headIds, materialIds);
+ return depotItemMapperEx.findByAllCount(headIds, materialIds);
}
public BigDecimal findByType(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
if (TYPE.equals(type)) {
if (isPrev) {
- return depotItemMapper.findByTypeInIsPrev(ProjectId, MId, MonthTime);
+ return depotItemMapperEx.findByTypeInIsPrev(ProjectId, MId, MonthTime);
} else {
- return depotItemMapper.findByTypeInIsNotPrev(ProjectId, MId, MonthTime);
+ return depotItemMapperEx.findByTypeInIsNotPrev(ProjectId, MId, MonthTime);
}
} else {
if (isPrev) {
- return depotItemMapper.findByTypeOutIsPrev(ProjectId, MId, MonthTime);
+ return depotItemMapperEx.findByTypeOutIsPrev(ProjectId, MId, MonthTime);
} else {
- return depotItemMapper.findByTypeOutIsNotPrev(ProjectId, MId, MonthTime);
+ return depotItemMapperEx.findByTypeOutIsNotPrev(ProjectId, MId, MonthTime);
}
}
}
@@ -177,41 +194,64 @@ public class DepotItemService {
public BigDecimal findPriceByType(String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) {
if (TYPE.equals(type)) {
if (isPrev) {
- return depotItemMapper.findPriceByTypeInIsPrev(ProjectId, MId, MonthTime);
+ return depotItemMapperEx.findPriceByTypeInIsPrev(ProjectId, MId, MonthTime);
} else {
- return depotItemMapper.findPriceByTypeInIsNotPrev(ProjectId, MId, MonthTime);
+ return depotItemMapperEx.findPriceByTypeInIsNotPrev(ProjectId, MId, MonthTime);
}
} else {
if (isPrev) {
- return depotItemMapper.findPriceByTypeOutIsPrev(ProjectId, MId, MonthTime);
+ return depotItemMapperEx.findPriceByTypeOutIsPrev(ProjectId, MId, MonthTime);
} else {
- return depotItemMapper.findPriceByTypeOutIsNotPrev(ProjectId, MId, MonthTime);
+ return depotItemMapperEx.findPriceByTypeOutIsNotPrev(ProjectId, MId, MonthTime);
}
}
}
public BigDecimal buyOrSale(String type, String subType, Long MId, String MonthTime, String sumType) {
if (SUM_TYPE.equals(sumType)) {
- return depotItemMapper.buyOrSaleNumber(type, subType, MId, MonthTime, sumType);
+ return depotItemMapperEx.buyOrSaleNumber(type, subType, MId, MonthTime, sumType);
} else {
- return depotItemMapper.buyOrSalePrice(type, subType, MId, MonthTime, sumType);
+ return depotItemMapperEx.buyOrSalePrice(type, subType, MId, MonthTime, sumType);
}
}
public BigDecimal findGiftByType(String subType, Integer ProjectId, Long MId, String type) {
if (IN.equals(type)) {
- return depotItemMapper.findGiftByTypeIn(subType, ProjectId, MId);
+ return depotItemMapperEx.findGiftByTypeIn(subType, ProjectId, MId);
} else {
- return depotItemMapper.findGiftByTypeOut(subType, ProjectId, MId);
+ return depotItemMapperEx.findGiftByTypeOut(subType, ProjectId, MId);
}
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
- public String saveDetials(String inserted, String deleted, String updated, Long headerId) throws DataAccessException{
- //转为json
+ public String saveDetials(String inserted, String deleted, String updated, Long headerId) throws Exception{
+ //查询单据主表信息
+ DepotHead depotHead=depotHeadMapper.selectByPrimaryKey(headerId);
+ //获得当前操作人
+ User userInfo=userService.getCurrentUser();
+ //转为json
JSONArray insertedJson = JSONArray.parseArray(inserted);
JSONArray deletedJson = JSONArray.parseArray(deleted);
JSONArray updatedJson = JSONArray.parseArray(updated);
+ /**
+ * 2019-01-28优先处理删除的
+ * 删除的可以继续卖，删除的需要将使用的序列号回收
+ * 插入的需要判断当前货源是否充足
+ * 更新的需要判断货源是否充足
+ * */
+ if (null != deletedJson) {
+ for (int i = 0; i < deletedJson.size(); i++) {
+ //首先回收序列号，如果是调拨，不用处理序列号
+ JSONObject tempDeletedJson = JSONObject.parseObject(deletedJson.getString(i));
+ if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
+ &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())){
+ DepotItem depotItem = getDepotItem(tempDeletedJson.getLong("Id"));
+ serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),depotItem.getOpernumber().intValue(),
+ new Date(),userInfo==null?null:userInfo.getId());
+ }
+ this.deleteDepotItem(tempDeletedJson.getLong("Id"));
+ }
+ }
if (null != insertedJson) {
for (int i = 0; i < insertedJson.size(); i++) {
DepotItem depotItem = new DepotItem();
@@ -289,18 +329,25 @@ public class DepotItemService {
depotItem.setMtype(tempInsertedJson.getString("MType"));
}
this.insertDepotItemWithObj(depotItem);
+ /**出库时处理序列号*/
+ if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
+ &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())){
+ //查询单据子表中开启序列号的数据列表
+ serialNumberService.checkAndUpdateSerialNumber(depotItem,userInfo);
+ }
}
}
- if (null != deletedJson) {
- for (int i = 0; i < deletedJson.size(); i++) {
- JSONObject tempDeletedJson = JSONObject.parseObject(deletedJson.getString(i));
- this.deleteDepotItem(tempDeletedJson.getLong("Id"));
- }
- }
+
if (null != updatedJson) {
for (int i = 0; i < updatedJson.size(); i++) {
JSONObject tempUpdatedJson = JSONObject.parseObject(updatedJson.getString(i));
DepotItem depotItem = this.getDepotItem(tempUpdatedJson.getLong("Id"));
+ //首先回收序列号
+ if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
+ &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())) {
+ serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(), depotItem.getOpernumber().intValue(),
+ new Date(),userInfo==null?null:userInfo.getId());
+ }
depotItem.setId(tempUpdatedJson.getLong("Id"));
depotItem.setMaterialid(tempUpdatedJson.getLong("MaterialId"));
depotItem.setMunit(tempUpdatedJson.getString("Unit"));
@@ -362,6 +409,12 @@ public class DepotItemService {
depotItem.setOtherfield5(tempUpdatedJson.getString("OtherField5"));
depotItem.setMtype(tempUpdatedJson.getString("MType"));
this.updateDepotItemWithObj(depotItem);
+ /**出库时处理序列号*/
+ if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
+ &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())){
+ //查询单据子表中开启序列号的数据列表
+ serialNumberService.checkAndUpdateSerialNumber(depotItem,userInfo);
+ }
}
}
return null;
@@ -386,4 +439,5 @@ public class DepotItemService {
}
return unitName;
}
+
}
diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
index ec2a2e0b..d87ba48f 100644
--- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
+++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
@@ -4,9 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.*;
-import com.jsh.erp.datasource.mappers.MaterialMapperEx;
-import com.jsh.erp.datasource.mappers.SerialNumberMapper;
-import com.jsh.erp.datasource.mappers.SerialNumberMapperEx;
+import com.jsh.erp.datasource.mappers.*;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.material.MaterialService;
@@ -39,9 +37,13 @@ public class SerialNumberService {
@Resource
private MaterialMapperEx materialMapperEx;
@Resource
+ private MaterialMapper materialMapper;
+ @Resource
private DepotItemService depotItemService;
@Resource
private UserService userService;
+ @Resource
+ private DepotItemMapperEx depotItemMapperEx;
public SerialNumber getSerialNumber(long id) {
@@ -173,9 +175,9 @@ public class SerialNumberService {
serialNumberEx.setMaterialId(getSerialNumberMaterialIdByMaterialName(serialNumberEx.getMaterialName()));
}
//删除标记,默认未删除
- serialNumberEx.setDeleteFlag(false);
+ serialNumberEx.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS);
//已卖出，默认未否
- serialNumberEx.setIsSell(false);
+ serialNumberEx.setIsSell(BusinessConstants.IS_SELL_HOLD);
Date date=new Date();
serialNumberEx.setCreateTime(date);
serialNumberEx.setUpdateTime(date);
@@ -231,7 +233,7 @@ public class SerialNumberService {
}
//获得唯一商品
- if(BusinessConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER==mlist.get(0).getEnableSerialNumber()){
+ if(BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableSerialNumber())){
//商品未开启序列号
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_CODE,
ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_MSG);
@@ -254,4 +256,66 @@ public class SerialNumberService {
return null;
}
+ /**
+ * create by: cjl
+ * description:
+ * 出库时判断序列号库存是否足够，
+ * 同时将对应的序列号绑定单据
+ * create time: 2019/1/24 16:24
+ * @Param: List
+ * @return void
+ */
+ public void checkAndUpdateSerialNumber(DepotItem depotItem,User userInfo) throws Exception{
+ if(depotItem!=null){
+ //查询商品下已分配的可用序列号数量
+ int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialid(),null,BusinessConstants.IS_SELL_HOLD);
+ if(depotItem.getOpernumber().intValue()>SerialNumberSum){
+ //获取商品名称
+ Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialid());
+ throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE,
+ String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName()));
+ }
+ //商品下序列号充足，分配序列号
+ sellSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),depotItem.getOpernumber().intValue(),userInfo);
+ }
+
+ }
+ /**
+ *
+ *
+ * */
+ /**
+ * create by: cjl
+ * description:
+ * 卖出序列号
+ * create time: 2019/1/25 9:17
+ * @Param: materialId
+ * @Param: depotheadId
+ * @Param: isSell 卖出'1'
+ * @Param: Count 卖出或者赎回的数量
+ * @return com.jsh.erp.datasource.entities.SerialNumberEx
+ */
+ @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+ public int sellSerialNumber(Long materialId, Long depotheadId,int count,User user) throws Exception{
+ return serialNumberMapperEx.sellSerialNumber(materialId,depotheadId,count,new Date(),user==null?null:user.getId());
+ }
+
+ /**
+ * create by: cjl
+ * description:
+ * 赎回序列号
+ * create time: 2019/1/25 9:17
+ * @Param: materialId
+ * @Param: depotheadId
+ * @Param: isSell 赎回'0'
+ * @Param: Count 卖出或者赎回的数量
+ * @return com.jsh.erp.datasource.entities.SerialNumberEx
+ */
+ @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+ public int cancelSerialNumber(Long materialId, Long depotheadId,int count,User user) throws Exception{
+ return serialNumberMapperEx.cancelSerialNumber(materialId,depotheadId,count,new Date(),user==null?null:user.getId());
+ }
+
+
+
}
diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
index 1f4ef4c3..72d97945 100644
--- a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
+++ b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
@@ -78,8 +78,13 @@ public class SupplierService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateAdvanceIn(Long supplierId, BigDecimal advanceIn){
Supplier supplier = supplierMapper.selectByPrimaryKey(supplierId);
- supplier.setAdvancein(supplier.getAdvancein().add(advanceIn)); //增加预收款的金额，可能增加的是负值
- return supplierMapper.updateByPrimaryKeySelective(supplier);
+ if(supplier!=null){
+ supplier.setAdvancein(supplier.getAdvancein().add(advanceIn)); //增加预收款的金额，可能增加的是负值
+ return supplierMapper.updateByPrimaryKeySelective(supplier);
+ }else{
+ return 0;
+ }
+
}
public List findBySelectCus() {
diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 2209360c..0995fd7f 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -282,4 +282,112 @@
+
+ insert into jsh_depothead (Type, SubType,
+ ProjectId, DefaultNumber, Number,
+ OperPersonName, CreateTime, OperTime,
+ OrganId, HandsPersonId, AccountId,
+ ChangeAmount, AllocationProjectId, TotalPrice,
+ PayType, Remark, Salesman,
+ AccountIdList, AccountMoneyList, Discount,
+ DiscountMoney, DiscountLastMoney, OtherMoney,
+ OtherMoneyList, OtherMoneyItem, AccountDay,
+ Status)
+ values (#{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR},
+ #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR},
+ #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP},
+ #{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT},
+ #{changeamount,jdbcType=DECIMAL}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DECIMAL},
+ #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR},
+ #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
+ #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL},
+ #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER},
+ #{status,jdbcType=BIT})
+
+
+ update jsh_depothead
+
+
+ Type = #{type,jdbcType=VARCHAR},
+
+
+ SubType = #{subtype,jdbcType=VARCHAR},
+
+
+ ProjectId = #{projectid,jdbcType=BIGINT},
+
+
+ DefaultNumber = #{defaultnumber,jdbcType=VARCHAR},
+
+
+ Number = #{number,jdbcType=VARCHAR},
+
+
+ OperPersonName = #{operpersonname,jdbcType=VARCHAR},
+
+
+ OperTime = #{opertime,jdbcType=TIMESTAMP},
+
+
+ OrganId = #{organid,jdbcType=BIGINT},
+
+
+ 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},
+
+
+ Salesman = #{salesman,jdbcType=VARCHAR},
+
+
+ AccountIdList = #{accountidlist,jdbcType=VARCHAR},
+
+
+ AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
+
+
+ Discount = #{discount,jdbcType=DECIMAL},
+
+
+ DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
+
+
+ DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
+
+
+ OtherMoney = #{othermoney,jdbcType=DECIMAL},
+
+
+ OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
+
+
+ OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
+
+
+ AccountDay = #{accountday,jdbcType=INTEGER},
+
+
+ Status = #{status,jdbcType=BIT},
+
+
+ where Id = #{id,jdbcType=BIGINT}
+
+
\ No newline at end of file
diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index a52c129b..4e4e54be 100644
--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -1,6 +1,7 @@
-
+
+
@@ -12,12 +13,12 @@
-
+
-
+
@@ -33,7 +34,7 @@
-
+
@@ -41,7 +42,7 @@
-
\ No newline at end of file
diff --git a/src/main/resources/mapper_xml/MaterialMapper.xml b/src/main/resources/mapper_xml/MaterialMapper.xml
index da08d931..cbf48213 100644
--- a/src/main/resources/mapper_xml/MaterialMapper.xml
+++ b/src/main/resources/mapper_xml/MaterialMapper.xml
@@ -29,7 +29,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
diff --git a/src/main/resources/mapper_xml/SerialNumberMapper.xml b/src/main/resources/mapper_xml/SerialNumberMapper.xml
index ea0d1c84..a4f7d571 100644
--- a/src/main/resources/mapper_xml/SerialNumberMapper.xml
+++ b/src/main/resources/mapper_xml/SerialNumberMapper.xml
@@ -9,13 +9,14 @@
-
+
-
+
+
id, material_Id, serial_Number, is_Sell, remark, delete_Flag, create_Time, creator,
- update_Time, updater
+ update_Time, updater,depothead_Id