purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加商品条码功能

Browse Source
This commit is contained in:
季圣华
2020-02-17 00:59:25 +08:00
parent 301d053bd4
commit 4b61eb59ee
33 changed files with 3728 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -158,7 +158,7 @@ public class DepotItemController {
for (DepotItemVo4WithInfoEx diEx : dataList) {
JSONObject item = new JSONObject();
item.put("Id", diEx.getId());
item.put("MaterialId", diEx.getMaterialid() == null ? "" : diEx.getMaterialid());
item.put("MaterialExtendId", diEx.getMaterialExtendId() == null ? "" : diEx.getMaterialExtendId());
String ratio; //比例
if (diEx.getUnitId() == null || diEx.getUnitId().equals("")) {
ratio = "";
@@ -167,7 +167,8 @@ public class DepotItemController {
ratio = ratio.substring(ratio.indexOf("("));
}
//品名/型号/扩展信息/包装
String MaterialName = (diEx.getMName() == null || diEx.getMName().equals("")) ? "" : diEx.getMName()
String MaterialName = diEx.getBarCode() + "_" + ((diEx.getMName() == null || diEx.getMName().equals("")) ? "" : diEx.getMName())
+ ((diEx.getMStandard() == null || diEx.getMStandard().equals("")) ? "" : "(" + diEx.getMStandard() + ")")
+ ((diEx.getMModel() == null || diEx.getMModel().equals("")) ? "" : "(" + diEx.getMModel() + ")");
String materialOther = getOtherInfo(mpArr, diEx);
MaterialName = MaterialName + materialOther + ((diEx.getUName() == null || diEx.getUName().equals("")) ? "" : "(" + diEx.getUName() + ")") + ratio;

160
src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -11,6 +11,7 @@ import com.jsh.erp.datasource.entities.DepotEx;
import com.jsh.erp.datasource.entities.Material;
import com.jsh.erp.datasource.entities.MaterialVo4Unit;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.material.MaterialService;
import com.jsh.erp.utils.*;
import jxl.Sheet;
@@ -40,6 +41,9 @@ public class MaterialController {
@Resource
private MaterialService materialService;
@Resource
private DepotItemService depotItemService;
@GetMapping(value = "/checkIsExist")
public String checkIsExist(@RequestParam("id") Long id, @RequestParam("name") String name,
@RequestParam("model") String model, @RequestParam("color") String color,
@@ -99,6 +103,31 @@ public class MaterialController {
return res;
}
/**
* 根据meId来查询商品名称
* @param meId
* @param request
* @return
*/
@GetMapping(value = "/findByIdWithBarCode")
public BaseResponseInfo findByIdWithBarCode(@RequestParam("meId") Long meId, HttpServletRequest request) throws Exception{
BaseResponseInfo res = new BaseResponseInfo();
try {
MaterialVo4Unit mu = new MaterialVo4Unit();
List<MaterialVo4Unit> list = materialService.findByIdWithBarCode(meId);
if(list!=null && list.size()>0) {
mu = list.get(0);
}
res.code = 200;
res.data = mu;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 查找商品信息-下拉框
* @param mpList
@@ -106,16 +135,25 @@ public class MaterialController {
* @return
*/
@GetMapping(value = "/findBySelect")
public JSONArray findBySelect(@RequestParam("mpList") String mpList, HttpServletRequest request) throws Exception{
JSONArray dataArray = new JSONArray();
public JSONObject findBySelect(@RequestParam(value = "q", required = false) String q,
@RequestParam("mpList") String mpList,
@RequestParam(value = "depotId", required = false) Long depotId,
@RequestParam("page") Integer currentPage,
@RequestParam("rows") Integer pageSize,
HttpServletRequest request) throws Exception{
JSONObject object = new JSONObject();
try {
List<MaterialVo4Unit> dataList = materialService.findBySelect();
Long tenantId = Long.parseLong(request.getSession().getAttribute("tenantId").toString());
List<MaterialVo4Unit> dataList = materialService.findBySelectWithBarCode(q, (currentPage-1)*pageSize, pageSize);
String[] mpArr = mpList.split(",");
int total = materialService.findBySelectWithBarCodeCount(q);
object.put("total", total);
JSONArray dataArray = new JSONArray();
//存放数据json数组
if (null != dataList) {
for (MaterialVo4Unit material : dataList) {
JSONObject item = new JSONObject();
item.put("Id", material.getId());
item.put("Id", material.getMeId()); //商品扩展表的id
String ratio; //比例
if (material.getUnitid() == null || material.getUnitid().equals("")) {
ratio = "";
@@ -124,36 +162,50 @@ public class MaterialController {
ratio = ratio.substring(ratio.indexOf("("));
}
//品名/型号/扩展信息/包装
String MaterialName = material.getName() + ((material.getModel() == null || material.getModel().equals("")) ? "" : "(" + material.getModel() + ")");
String MaterialName = "";
String mBarCode = "";
if(material.getmBarCode()!=null) {
mBarCode = material.getmBarCode();
MaterialName = MaterialName + mBarCode + "_";
}
item.put("mBarCode", mBarCode);
MaterialName = MaterialName + " " + material.getName()
+ ((material.getStandard() == null || material.getStandard().equals("")) ? "" : "(" + material.getStandard() + ")")
+ ((material.getModel() == null || material.getModel().equals("")) ? "" : "(" + material.getModel() + ")");
String expand = ""; //扩展信息
for (int i = 0; i < mpArr.length; i++) {
if (mpArr[i].equals("颜色")) {
MaterialName = MaterialName + ((material.getColor() == null || material.getColor().equals("")) ? "" : "(" + material.getColor() + ")");
}
if (mpArr[i].equals("规格")) {
MaterialName = MaterialName + ((material.getStandard() == null || material.getStandard().equals("")) ? "" : "(" + material.getStandard() + ")");
}
if (mpArr[i].equals("制造商")) {
MaterialName = MaterialName + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
}
if (mpArr[i].equals("自定义1")) {
MaterialName = MaterialName + ((material.getOtherfield1() == null || material.getOtherfield1().equals("")) ? "" : "(" + material.getOtherfield1() + ")");
expand = expand + ((material.getOtherfield1() == null || material.getOtherfield1().equals("")) ? "" : "(" + material.getOtherfield1() + ")");
}
if (mpArr[i].equals("自定义2")) {
MaterialName = MaterialName + ((material.getOtherfield2() == null || material.getOtherfield2().equals("")) ? "" : "(" + material.getOtherfield2() + ")");
expand = expand + ((material.getOtherfield2() == null || material.getOtherfield2().equals("")) ? "" : "(" + material.getOtherfield2() + ")");
}
if (mpArr[i].equals("自定义3")) {
MaterialName = MaterialName + ((material.getOtherfield3() == null || material.getOtherfield3().equals("")) ? "" : "(" + material.getOtherfield3() + ")");
expand = expand + ((material.getOtherfield3() == null || material.getOtherfield3().equals("")) ? "" : "(" + material.getOtherfield3() + ")");
}
}
MaterialName = MaterialName + ((material.getUnit() == null || material.getUnit().equals("")) ? "" : "(" + material.getUnit() + ")") + ratio;
MaterialName = MaterialName + expand + ((material.getCommodityUnit() == null || material.getCommodityUnit().equals("")) ? "" : "(" + material.getCommodityUnit() + ")") + ratio;
item.put("MaterialName", MaterialName);
item.put("name", material.getName());
item.put("expand", expand);
item.put("model", material.getModel());
item.put("standard", material.getStandard());
item.put("unit", material.getCommodityUnit() + ratio);
if(depotId!=null&& StringUtil.isNotEmpty(q)) {
BigDecimal stock = depotItemService.getStockByParam(depotId,material.getId(),null,null,tenantId);
item.put("stock", stock);
}
dataArray.add(item);
}
}
object.put("rows", dataArray);
} catch (Exception e) {
e.printStackTrace();
}
return dataArray;
return object;
}
@@ -188,6 +240,69 @@ public class MaterialController {
return res;
}
/**
* 根据商品id查找商品信息
* @param meId
* @param request
* @return
* @throws Exception
*/
@GetMapping(value = "/getMaterialByMeId")
public JSONObject getMaterialByMeId(@RequestParam("meId") long meId,
@RequestParam("mpList") String mpList,
HttpServletRequest request) throws Exception{
JSONObject item = new JSONObject();
try {
String[] mpArr = mpList.split(",");
List<MaterialVo4Unit> materialList = materialService.getMaterialByMeId(meId);
if(materialList!=null && materialList.size()!=1) {
return item;
} else if(materialList.size() == 1) {
MaterialVo4Unit material = materialList.get(0);
item.put("Id", material.getMeId()); //商品扩展表的id
String ratio; //比例
if (material.getUnitid() == null || material.getUnitid().equals("")) {
ratio = "";
} else {
ratio = material.getUnitName();
ratio = ratio.substring(ratio.indexOf("("));
}
//品名/型号/扩展信息/包装
String MaterialName = "";
MaterialName = MaterialName + material.getmBarCode() + "_" + material.getName()
+ ((material.getStandard() == null || material.getStandard().equals("")) ? "" : "(" + material.getStandard() + ")");
String expand = ""; //扩展信息
for (int i = 0; i < mpArr.length; i++) {
if (mpArr[i].equals("颜色")) {
expand = expand + ((material.getColor() == null || material.getColor().equals("")) ? "" : "(" + material.getColor() + ")");
}
if (mpArr[i].equals("制造商")) {
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
}
if (mpArr[i].equals("自定义1")) {
expand = expand + ((material.getOtherfield1() == null || material.getOtherfield1().equals("")) ? "" : "(" + material.getOtherfield1() + ")");
}
if (mpArr[i].equals("自定义2")) {
expand = expand + ((material.getOtherfield2() == null || material.getOtherfield2().equals("")) ? "" : "(" + material.getOtherfield2() + ")");
}
if (mpArr[i].equals("自定义3")) {
expand = expand + ((material.getOtherfield3() == null || material.getOtherfield3().equals("")) ? "" : "(" + material.getOtherfield3() + ")");
}
}
MaterialName = MaterialName + expand + ((material.getUnit() == null || material.getUnit().equals("")) ? "" : "(" + material.getUnit() + ")") + ratio;
item.put("MaterialName", MaterialName);
item.put("name", material.getName());
item.put("expand", expand);
item.put("model", material.getModel());
item.put("standard", material.getStandard());
item.put("unit", material.getUnit() + ratio);
}
} catch (Exception e) {
e.printStackTrace();
}
return item;
}
/**
* 生成excel表格
* @param name
@@ -340,4 +455,15 @@ public class MaterialController {
}
return result;
}
@GetMapping(value = "/getMaxBarCode")
public BaseResponseInfo getMaxBarCode() throws Exception {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
String barCode = materialService.getMaxBarCode();
map.put("barCode", barCode);
res.code = 200;
res.data = map;
return res;
}
}

71
src/main/java/com/jsh/erp/controller/MaterialExtendController.java Normal file
View File

@@ -0,0 +1,71 @@
package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.vo.MaterialExtendVo4List;
import com.jsh.erp.service.MaterialExtend.MaterialExtendService;
import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.ErpInfo;
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.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
/**
* @author jijiaqing
*/
@RestController
@RequestMapping(value = "/materialsExtend")
public class MaterialExtendController {
private Logger logger = LoggerFactory.getLogger(MaterialExtendController.class);
@Resource
private MaterialExtendService materialExtendService;
@GetMapping(value = "/getDetailList")
public BaseResponseInfo getDetailList(@RequestParam("materialId") Long materialId,
HttpServletRequest request)throws Exception {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
try {
List<MaterialExtendVo4List> dataList = new ArrayList<MaterialExtendVo4List>();
if(materialId!=0) {
dataList = materialExtendService.getDetailList(materialId);
}
JSONObject outer = new JSONObject();
outer.put("total", dataList.size());
//存放数据json数组
JSONArray dataArray = new JSONArray();
if (null != dataList) {
for (MaterialExtendVo4List md : dataList) {
JSONObject item = new JSONObject();
item.put("Id", md.getId());
item.put("BarCode", md.getBarCode());
item.put("CommodityUnit", md.getCommodityUnit());
item.put("PurchaseDecimal", md.getPurchaseDecimal());
item.put("CommodityDecimal", md.getCommodityDecimal());
item.put("WholesaleDecimal", md.getWholesaleDecimal());
item.put("LowDecimal", md.getLowDecimal());
dataArray.add(item);
}
}
outer.put("rows", dataArray);
res.code = 200;
res.data = outer;
} catch (Exception e) {
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
}

560
src/main/java/com/jsh/erp/datasource/entities/DepotItem.java
View File

@@ -3,802 +3,262 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class DepotItem {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.HeaderId
*
* @mbggenerated
*/
private Long headerid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.MaterialId
*
* @mbggenerated
*/
private Long materialid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.MUnit
*
* @mbggenerated
*/
private Long materialExtendId;
private String munit;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.OperNumber
*
* @mbggenerated
*/
private BigDecimal opernumber;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.BasicNumber
*
* @mbggenerated
*/
private BigDecimal basicnumber;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.UnitPrice
*
* @mbggenerated
*/
private BigDecimal unitprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.TaxUnitPrice
*
* @mbggenerated
*/
private BigDecimal taxunitprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.AllPrice
*
* @mbggenerated
*/
private BigDecimal allprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.Img
*
* @mbggenerated
*/
private String img;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.Incidentals
*
* @mbggenerated
*/
private BigDecimal incidentals;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.DepotId
*
* @mbggenerated
*/
private Long depotid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.AnotherDepotId
*
* @mbggenerated
*/
private Long anotherdepotid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.TaxRate
*
* @mbggenerated
*/
private BigDecimal taxrate;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.TaxMoney
*
* @mbggenerated
*/
private BigDecimal taxmoney;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.TaxLastMoney
*
* @mbggenerated
*/
private BigDecimal taxlastmoney;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.OtherField1
*
* @mbggenerated
*/
private String otherfield1;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.OtherField2
*
* @mbggenerated
*/
private String otherfield2;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.OtherField3
*
* @mbggenerated
*/
private String otherfield3;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.OtherField4
*
* @mbggenerated
*/
private String otherfield4;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.OtherField5
*
* @mbggenerated
*/
private String otherfield5;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.MType
*
* @mbggenerated
*/
private String mtype;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depotitem.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.Id
*
* @return the value of jsh_depotitem.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.Id
*
* @param id the value for jsh_depotitem.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.HeaderId
*
* @return the value of jsh_depotitem.HeaderId
*
* @mbggenerated
*/
public Long getHeaderid() {
return headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.HeaderId
*
* @param headerid the value for jsh_depotitem.HeaderId
*
* @mbggenerated
*/
public void setHeaderid(Long headerid) {
this.headerid = headerid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.MaterialId
*
* @return the value of jsh_depotitem.MaterialId
*
* @mbggenerated
*/
public Long getMaterialid() {
return materialid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.MaterialId
*
* @param materialid the value for jsh_depotitem.MaterialId
*
* @mbggenerated
*/
public void setMaterialid(Long materialid) {
this.materialid = materialid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.MUnit
*
* @return the value of jsh_depotitem.MUnit
*
* @mbggenerated
*/
public Long getMaterialExtendId() {
return materialExtendId;
}
public void setMaterialExtendId(Long materialExtendId) {
this.materialExtendId = materialExtendId;
}
public String getMunit() {
return munit;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.MUnit
*
* @param munit the value for jsh_depotitem.MUnit
*
* @mbggenerated
*/
public void setMunit(String munit) {
this.munit = munit == null ? null : munit.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.OperNumber
*
* @return the value of jsh_depotitem.OperNumber
*
* @mbggenerated
*/
public BigDecimal getOpernumber() {
return opernumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.OperNumber
*
* @param opernumber the value for jsh_depotitem.OperNumber
*
* @mbggenerated
*/
public void setOpernumber(BigDecimal opernumber) {
this.opernumber = opernumber;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.BasicNumber
*
* @return the value of jsh_depotitem.BasicNumber
*
* @mbggenerated
*/
public BigDecimal getBasicnumber() {
return basicnumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.BasicNumber
*
* @param basicnumber the value for jsh_depotitem.BasicNumber
*
* @mbggenerated
*/
public void setBasicnumber(BigDecimal basicnumber) {
this.basicnumber = basicnumber;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.UnitPrice
*
* @return the value of jsh_depotitem.UnitPrice
*
* @mbggenerated
*/
public BigDecimal getUnitprice() {
return unitprice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.UnitPrice
*
* @param unitprice the value for jsh_depotitem.UnitPrice
*
* @mbggenerated
*/
public void setUnitprice(BigDecimal unitprice) {
this.unitprice = unitprice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.TaxUnitPrice
*
* @return the value of jsh_depotitem.TaxUnitPrice
*
* @mbggenerated
*/
public BigDecimal getTaxunitprice() {
return taxunitprice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.TaxUnitPrice
*
* @param taxunitprice the value for jsh_depotitem.TaxUnitPrice
*
* @mbggenerated
*/
public void setTaxunitprice(BigDecimal taxunitprice) {
this.taxunitprice = taxunitprice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.AllPrice
*
* @return the value of jsh_depotitem.AllPrice
*
* @mbggenerated
*/
public BigDecimal getAllprice() {
return allprice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.AllPrice
*
* @param allprice the value for jsh_depotitem.AllPrice
*
* @mbggenerated
*/
public void setAllprice(BigDecimal allprice) {
this.allprice = allprice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.Remark
*
* @return the value of jsh_depotitem.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.Remark
*
* @param remark the value for jsh_depotitem.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.Img
*
* @return the value of jsh_depotitem.Img
*
* @mbggenerated
*/
public String getImg() {
return img;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.Img
*
* @param img the value for jsh_depotitem.Img
*
* @mbggenerated
*/
public void setImg(String img) {
this.img = img == null ? null : img.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.Incidentals
*
* @return the value of jsh_depotitem.Incidentals
*
* @mbggenerated
*/
public BigDecimal getIncidentals() {
return incidentals;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.Incidentals
*
* @param incidentals the value for jsh_depotitem.Incidentals
*
* @mbggenerated
*/
public void setIncidentals(BigDecimal incidentals) {
this.incidentals = incidentals;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.DepotId
*
* @return the value of jsh_depotitem.DepotId
*
* @mbggenerated
*/
public Long getDepotid() {
return depotid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.DepotId
*
* @param depotid the value for jsh_depotitem.DepotId
*
* @mbggenerated
*/
public void setDepotid(Long depotid) {
this.depotid = depotid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.AnotherDepotId
*
* @return the value of jsh_depotitem.AnotherDepotId
*
* @mbggenerated
*/
public Long getAnotherdepotid() {
return anotherdepotid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.AnotherDepotId
*
* @param anotherdepotid the value for jsh_depotitem.AnotherDepotId
*
* @mbggenerated
*/
public void setAnotherdepotid(Long anotherdepotid) {
this.anotherdepotid = anotherdepotid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.TaxRate
*
* @return the value of jsh_depotitem.TaxRate
*
* @mbggenerated
*/
public BigDecimal getTaxrate() {
return taxrate;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.TaxRate
*
* @param taxrate the value for jsh_depotitem.TaxRate
*
* @mbggenerated
*/
public void setTaxrate(BigDecimal taxrate) {
this.taxrate = taxrate;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.TaxMoney
*
* @return the value of jsh_depotitem.TaxMoney
*
* @mbggenerated
*/
public BigDecimal getTaxmoney() {
return taxmoney;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.TaxMoney
*
* @param taxmoney the value for jsh_depotitem.TaxMoney
*
* @mbggenerated
*/
public void setTaxmoney(BigDecimal taxmoney) {
this.taxmoney = taxmoney;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.TaxLastMoney
*
* @return the value of jsh_depotitem.TaxLastMoney
*
* @mbggenerated
*/
public BigDecimal getTaxlastmoney() {
return taxlastmoney;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.TaxLastMoney
*
* @param taxlastmoney the value for jsh_depotitem.TaxLastMoney
*
* @mbggenerated
*/
public void setTaxlastmoney(BigDecimal taxlastmoney) {
this.taxlastmoney = taxlastmoney;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.OtherField1
*
* @return the value of jsh_depotitem.OtherField1
*
* @mbggenerated
*/
public String getOtherfield1() {
return otherfield1;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.OtherField1
*
* @param otherfield1 the value for jsh_depotitem.OtherField1
*
* @mbggenerated
*/
public void setOtherfield1(String otherfield1) {
this.otherfield1 = otherfield1 == null ? null : otherfield1.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.OtherField2
*
* @return the value of jsh_depotitem.OtherField2
*
* @mbggenerated
*/
public String getOtherfield2() {
return otherfield2;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.OtherField2
*
* @param otherfield2 the value for jsh_depotitem.OtherField2
*
* @mbggenerated
*/
public void setOtherfield2(String otherfield2) {
this.otherfield2 = otherfield2 == null ? null : otherfield2.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.OtherField3
*
* @return the value of jsh_depotitem.OtherField3
*
* @mbggenerated
*/
public String getOtherfield3() {
return otherfield3;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.OtherField3
*
* @param otherfield3 the value for jsh_depotitem.OtherField3
*
* @mbggenerated
*/
public void setOtherfield3(String otherfield3) {
this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.OtherField4
*
* @return the value of jsh_depotitem.OtherField4
*
* @mbggenerated
*/
public String getOtherfield4() {
return otherfield4;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.OtherField4
*
* @param otherfield4 the value for jsh_depotitem.OtherField4
*
* @mbggenerated
*/
public void setOtherfield4(String otherfield4) {
this.otherfield4 = otherfield4 == null ? null : otherfield4.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.OtherField5
*
* @return the value of jsh_depotitem.OtherField5
*
* @mbggenerated
*/
public String getOtherfield5() {
return otherfield5;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.OtherField5
*
* @param otherfield5 the value for jsh_depotitem.OtherField5
*
* @mbggenerated
*/
public void setOtherfield5(String otherfield5) {
this.otherfield5 = otherfield5 == null ? null : otherfield5.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.MType
*
* @return the value of jsh_depotitem.MType
*
* @mbggenerated
*/
public String getMtype() {
return mtype;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.MType
*
* @param mtype the value for jsh_depotitem.MType
*
* @mbggenerated
*/
public void setMtype(String mtype) {
this.mtype = mtype == null ? null : mtype.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.tenant_id
*
* @return the value of jsh_depotitem.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.tenant_id
*
* @param tenantId the value for jsh_depotitem.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depotitem.delete_Flag
*
* @return the value of jsh_depotitem.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depotitem.delete_Flag
*
* @param deleteFlag the value for jsh_depotitem.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}

167
src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java
View File

@@ -5,118 +5,46 @@ import java.util.ArrayList;
import java.util.List;
public class DepotItemExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public DepotItemExample() {
oredCriteria = new ArrayList<Criteria>();
oredCriteria = new ArrayList<>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class DepotItemExample {
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -375,6 +285,66 @@ public class DepotItemExample {
return (Criteria) this;
}
public Criteria andMaterialExtendIdIsNull() {
addCriterion("material_extend_id is null");
return (Criteria) this;
}
public Criteria andMaterialExtendIdIsNotNull() {
addCriterion("material_extend_id is not null");
return (Criteria) this;
}
public Criteria andMaterialExtendIdEqualTo(Long value) {
addCriterion("material_extend_id =", value, "materialExtendId");
return (Criteria) this;
}
public Criteria andMaterialExtendIdNotEqualTo(Long value) {
addCriterion("material_extend_id <>", value, "materialExtendId");
return (Criteria) this;
}
public Criteria andMaterialExtendIdGreaterThan(Long value) {
addCriterion("material_extend_id >", value, "materialExtendId");
return (Criteria) this;
}
public Criteria andMaterialExtendIdGreaterThanOrEqualTo(Long value) {
addCriterion("material_extend_id >=", value, "materialExtendId");
return (Criteria) this;
}
public Criteria andMaterialExtendIdLessThan(Long value) {
addCriterion("material_extend_id <", value, "materialExtendId");
return (Criteria) this;
}
public Criteria andMaterialExtendIdLessThanOrEqualTo(Long value) {
addCriterion("material_extend_id <=", value, "materialExtendId");
return (Criteria) this;
}
public Criteria andMaterialExtendIdIn(List<Long> values) {
addCriterion("material_extend_id in", values, "materialExtendId");
return (Criteria) this;
}
public Criteria andMaterialExtendIdNotIn(List<Long> values) {
addCriterion("material_extend_id not in", values, "materialExtendId");
return (Criteria) this;
}
public Criteria andMaterialExtendIdBetween(Long value1, Long value2) {
addCriterion("material_extend_id between", value1, value2, "materialExtendId");
return (Criteria) this;
}
public Criteria andMaterialExtendIdNotBetween(Long value1, Long value2) {
addCriterion("material_extend_id not between", value1, value2, "materialExtendId");
return (Criteria) this;
}
public Criteria andMunitIsNull() {
addCriterion("MUnit is null");
return (Criteria) this;
@@ -1796,25 +1766,12 @@ public class DepotItemExample {
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depotitem
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
public static class Criterion {
private String condition;

10
src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
View File

@@ -36,6 +36,8 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
private String priceStrategy;
private String barCode;
public Long getMId() {
return MId;
}
@@ -163,4 +165,12 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
public void setPriceStrategy(String priceStrategy) {
this.priceStrategy = priceStrategy;
}
public String getBarCode() {
return barCode;
}
public void setBarCode(String barCode) {
this.barCode = barCode;
}
}

146
src/main/java/com/jsh/erp/datasource/entities/MaterialExtend.java Normal file
View File

@@ -0,0 +1,146 @@
package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
import java.util.Date;
public class MaterialExtend {
private Long id;
private Long materialId;
private String barCode;
private String commodityUnit;
private BigDecimal purchaseDecimal;
private BigDecimal commodityDecimal;
private BigDecimal wholesaleDecimal;
private BigDecimal lowDecimal;
private Date createTime;
private String createSerial;
private String updateSerial;
private Long updateTime;
private Long tenantId;
private String deleteFlag;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getMaterialId() {
return materialId;
}
public void setMaterialId(Long materialId) {
this.materialId = materialId;
}
public String getBarCode() {
return barCode;
}
public void setBarCode(String barCode) {
this.barCode = barCode == null ? null : barCode.trim();
}
public String getCommodityUnit() {
return commodityUnit;
}
public void setCommodityUnit(String commodityUnit) {
this.commodityUnit = commodityUnit == null ? null : commodityUnit.trim();
}
public BigDecimal getPurchaseDecimal() {
return purchaseDecimal;
}
public void setPurchaseDecimal(BigDecimal purchaseDecimal) {
this.purchaseDecimal = purchaseDecimal;
}
public BigDecimal getCommodityDecimal() {
return commodityDecimal;
}
public void setCommodityDecimal(BigDecimal commodityDecimal) {
this.commodityDecimal = commodityDecimal;
}
public BigDecimal getWholesaleDecimal() {
return wholesaleDecimal;
}
public void setWholesaleDecimal(BigDecimal wholesaleDecimal) {
this.wholesaleDecimal = wholesaleDecimal;
}
public BigDecimal getLowDecimal() {
return lowDecimal;
}
public void setLowDecimal(BigDecimal lowDecimal) {
this.lowDecimal = lowDecimal;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateSerial() {
return createSerial;
}
public void setCreateSerial(String createSerial) {
this.createSerial = createSerial == null ? null : createSerial.trim();
}
public String getUpdateSerial() {
return updateSerial;
}
public void setUpdateSerial(String updateSerial) {
this.updateSerial = updateSerial == null ? null : updateSerial.trim();
}
public Long getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Long updateTime) {
this.updateTime = updateTime;
}
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
public String getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}
}

1091
src/main/java/com/jsh/erp/datasource/entities/MaterialExtendExample.java Normal file
View File

File diff suppressed because it is too large Load Diff

70
src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
View File

@@ -12,6 +12,20 @@ public class MaterialVo4Unit extends Material{
private BigDecimal stock;
private BigDecimal purchaseDecimal;
private BigDecimal commodityDecimal;
private BigDecimal wholesaleDecimal;
private BigDecimal lowDecimal;
private String mBarCode;
private String commodityUnit;
private Long meId;
public String getUnitName() {
return unitName;
}
@@ -43,4 +57,60 @@ public class MaterialVo4Unit extends Material{
public void setStock(BigDecimal stock) {
this.stock = stock;
}
public BigDecimal getPurchaseDecimal() {
return purchaseDecimal;
}
public void setPurchaseDecimal(BigDecimal purchaseDecimal) {
this.purchaseDecimal = purchaseDecimal;
}
public BigDecimal getCommodityDecimal() {
return commodityDecimal;
}
public void setCommodityDecimal(BigDecimal commodityDecimal) {
this.commodityDecimal = commodityDecimal;
}
public BigDecimal getWholesaleDecimal() {
return wholesaleDecimal;
}
public void setWholesaleDecimal(BigDecimal wholesaleDecimal) {
this.wholesaleDecimal = wholesaleDecimal;
}
public BigDecimal getLowDecimal() {
return lowDecimal;
}
public void setLowDecimal(BigDecimal lowDecimal) {
this.lowDecimal = lowDecimal;
}
public String getmBarCode() {
return mBarCode;
}
public void setmBarCode(String mBarCode) {
this.mBarCode = mBarCode;
}
public String getCommodityUnit() {
return commodityUnit;
}
public void setCommodityUnit(String commodityUnit) {
this.commodityUnit = commodityUnit;
}
public Long getMeId() {
return meId;
}
public void setMeId(Long meId) {
this.meId = meId;
}
}

68
src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DepotItemMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int countByExample(DepotItemExample example);
long countByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insert(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int insertSelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
List<DepotItem> selectByExample(DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
DepotItem selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByExample(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(DepotItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depotitem
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotItem record);
}

30
src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapper.java Normal file
View File

@@ -0,0 +1,30 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.MaterialExtend;
import com.jsh.erp.datasource.entities.MaterialExtendExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface MaterialExtendMapper {
long countByExample(MaterialExtendExample example);
int deleteByExample(MaterialExtendExample example);
int deleteByPrimaryKey(Long id);
int insert(MaterialExtend record);
int insertSelective(MaterialExtend record);
List<MaterialExtend> selectByExample(MaterialExtendExample example);
MaterialExtend selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") MaterialExtend record, @Param("example") MaterialExtendExample example);
int updateByExample(@Param("record") MaterialExtend record, @Param("example") MaterialExtendExample example);
int updateByPrimaryKeySelective(MaterialExtend record);
int updateByPrimaryKey(MaterialExtend record);
}

23
src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java Normal file
View File

@@ -0,0 +1,23 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.MaterialExtend;
import com.jsh.erp.datasource.vo.MaterialExtendVo4List;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface MaterialExtendMapperEx {
int batchDeleteMaterialExtendByIds(@Param("ids") String ids[]);
List<MaterialExtendVo4List> getDetailList(
@Param("materialId") Long materialId);
Long getMaxTimeByTenantAndTime(
@Param("tenantId") Long tenantId,
@Param("lastTime") Long lastTime,
@Param("syncNum") Long syncNum);
List<MaterialExtend> getListByMId(@Param("ids") Long ids[]);
}

15
src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
View File

@@ -19,6 +19,7 @@ public interface MaterialMapperEx {
List<MaterialVo4Unit> selectByConditionMaterial(
@Param("name") String name,
@Param("standard") String standard,
@Param("model") String model,
@Param("categoryIds") String categoryIds,
@Param("mpList") String mpList,
@@ -27,6 +28,7 @@ public interface MaterialMapperEx {
Long countsByMaterial(
@Param("name") String name,
@Param("standard") String standard,
@Param("model") String model,
@Param("categoryIds") String categoryIds,
@Param("mpList") String mpList);
@@ -35,8 +37,16 @@ public interface MaterialMapperEx {
List<MaterialVo4Unit> findById(@Param("id") Long id);
List<MaterialVo4Unit> findByIdWithBarCode(@Param("meId") Long meId);
List<MaterialVo4Unit> findBySelect();
List<MaterialVo4Unit> findBySelectWithBarCode(@Param("q") String q,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findBySelectWithBarCodeCount(@Param("q") String q);
int updatePriceNullByPrimaryKey(Long id);
int updateUnitIdNullByPrimaryKey(Long id);
@@ -60,5 +70,8 @@ public interface MaterialMapperEx {
List<Material> getMaterialListByUnitIds(@Param("unitIds") String[] unitIds);
int insertSelectiveEx(Material record);
String getMaxBarCode();
List<MaterialVo4Unit> getMaterialByMeId(
@Param("meId") Long meId);
}

68
src/main/java/com/jsh/erp/datasource/vo/MaterialExtendVo4List.java Normal file
View File

@@ -0,0 +1,68 @@
package com.jsh.erp.datasource.vo;
import com.jsh.erp.datasource.entities.MaterialExtend;
import java.math.BigDecimal;
public class MaterialExtendVo4List extends MaterialExtend {
private String supplier;
private String originPlace;
private String unit;
private String brandName;
private BigDecimal guaranteePeriod;
private BigDecimal memberDecimal;
public String getSupplier() {
return supplier;
}
public void setSupplier(String supplier) {
this.supplier = supplier;
}
public String getOriginPlace() {
return originPlace;
}
public void setOriginPlace(String originPlace) {
this.originPlace = originPlace;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getBrandName() {
return brandName;
}
public void setBrandName(String brandName) {
this.brandName = brandName;
}
public BigDecimal getGuaranteePeriod() {
return guaranteePeriod;
}
public void setGuaranteePeriod(BigDecimal guaranteePeriod) {
this.guaranteePeriod = guaranteePeriod;
}
public BigDecimal getMemberDecimal() {
return memberDecimal;
}
public void setMemberDecimal(BigDecimal memberDecimal) {
this.memberDecimal = memberDecimal;
}
}

64
src/main/java/com/jsh/erp/service/MaterialExtend/MaterialExtendComponent.java Normal file
View File

@@ -0,0 +1,64 @@
package com.jsh.erp.service.MaterialExtend;
import com.jsh.erp.service.ICommonQuery;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@Service(value = "material_extend")
@MaterialExtendResource
public class MaterialExtendComponent implements ICommonQuery {
@Resource
private MaterialExtendService materialExtendService;
@Override
public Object selectOne(Long id) throws Exception {
return materialExtendService.getMaterialExtend(id);
}
@Override
public List<?> select(Map<String, String> map)throws Exception {
return getMaterialList(map);
}
private List<?> getMaterialList(Map<String, String> map) throws Exception{
return null;
}
@Override
public Long counts(Map<String, String> map)throws Exception {
return 0L;
}
@Override
public int insert(String beanJson, HttpServletRequest request) throws Exception{
return materialExtendService.insertMaterialExtend(beanJson, request);
}
@Override
public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
return materialExtendService.updateMaterialExtend(beanJson, id, request);
}
@Override
public int delete(Long id, HttpServletRequest request)throws Exception {
return materialExtendService.deleteMaterialExtend(id, request);
}
@Override
public int batchDelete(String ids, HttpServletRequest request)throws Exception {
return materialExtendService.batchDeleteMaterialExtendByIds(ids, request);
}
@Override
public int checkIsNameExist(Long id, String name)throws Exception {
return materialExtendService.checkIsExist(id, name);
}
}

15
src/main/java/com/jsh/erp/service/MaterialExtend/MaterialExtendResource.java Normal file
View File

@@ -0,0 +1,15 @@
package com.jsh.erp.service.MaterialExtend;
import com.jsh.erp.service.ResourceInfo;
import java.lang.annotation.*;
/**
* @author jishenghua qq752718920 2018-10-7 15:26:27
*/
@ResourceInfo(value = "materialExtend", type = 1574012422)
@Inherited
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface MaterialExtendResource {
}

329
src/main/java/com/jsh/erp/service/MaterialExtend/MaterialExtendService.java Normal file
View File

@@ -0,0 +1,329 @@
package com.jsh.erp.service.MaterialExtend;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.datasource.entities.MaterialExtend;
import com.jsh.erp.datasource.entities.MaterialExtendExample;
import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.mappers.MaterialExtendMapper;
import com.jsh.erp.datasource.mappers.MaterialExtendMapperEx;
import com.jsh.erp.datasource.vo.MaterialExtendVo4List;
import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Service
public class MaterialExtendService {
private Logger logger = LoggerFactory.getLogger(MaterialExtendService.class);
@Resource
private MaterialExtendMapper materialExtendMapper;
@Resource
private MaterialExtendMapperEx materialExtendMapperEx;
@Resource
private LogService logService;
@Resource
private UserService userService;
public MaterialExtend getMaterialExtend(long id)throws Exception {
MaterialExtend result=null;
try{
result=materialExtendMapper.selectByPrimaryKey(id);
}catch(Exception e){
JshException.readFail(logger, e);
}
return result;
}
public List<MaterialExtendVo4List> getDetailList(Long materialId) {
List<MaterialExtendVo4List> list=null;
try{
list = materialExtendMapperEx.getDetailList(materialId);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public List<MaterialExtend> getListByMIds(List<Long> idList) {
List<MaterialExtend> meList = null;
try{
Long [] idArray= StringUtil.listToLongArray(idList);
if(idArray!=null && idArray.length>0) {
meList = materialExtendMapperEx.getListByMId(idArray);
}
}catch(Exception e){
JshException.readFail(logger, e);
}
return meList;
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public String saveDetials(String inserted, String deleted, String updated,Long materialId) throws Exception {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
logService.insertLog("商品价格扩展",
BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
//转为json
JSONArray insertedJson = JSONArray.parseArray(inserted);
JSONArray deletedJson = JSONArray.parseArray(deleted);
JSONArray updatedJson = JSONArray.parseArray(updated);
if (null != insertedJson) {
for (int i = 0; i < insertedJson.size(); i++) {
MaterialExtend materialExtend = new MaterialExtend();
JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
materialExtend.setMaterialId(materialId);
if (StringUtils.isNotEmpty(tempInsertedJson.getString("BarCode"))) {
materialExtend.setBarCode(tempInsertedJson.getString("BarCode"));
}
if (StringUtils.isNotEmpty(tempInsertedJson.getString("CommodityUnit"))) {
materialExtend.setCommodityUnit(tempInsertedJson.getString("CommodityUnit"));
}
if (StringUtils.isNotEmpty(tempInsertedJson.getString("PurchaseDecimal"))) {
materialExtend.setPurchaseDecimal(tempInsertedJson.getBigDecimal("PurchaseDecimal"));
}
if (StringUtils.isNotEmpty(tempInsertedJson.getString("CommodityDecimal"))) {
materialExtend.setCommodityDecimal(tempInsertedJson.getBigDecimal("CommodityDecimal"));
}
if (StringUtils.isNotEmpty(tempInsertedJson.getString("WholesaleDecimal"))) {
materialExtend.setWholesaleDecimal(tempInsertedJson.getBigDecimal("WholesaleDecimal"));
}
if (StringUtils.isNotEmpty(tempInsertedJson.getString("LowDecimal"))) {
materialExtend.setLowDecimal(tempInsertedJson.getBigDecimal("LowDecimal"));
}
this.insertMaterialExtend(materialExtend);
}
}
if (null != deletedJson) {
StringBuffer bf=new StringBuffer();
for (int i = 0; i < deletedJson.size(); i++) {
JSONObject tempDeletedJson = JSONObject.parseObject(deletedJson.getString(i));
bf.append(tempDeletedJson.getLong("Id"));
if(i<(deletedJson.size()-1)){
bf.append(",");
}
}
this.batchDeleteMaterialExtendByIds(bf.toString(), request);
}
if (null != updatedJson) {
for (int i = 0; i < updatedJson.size(); i++) {
JSONObject tempUpdatedJson = JSONObject.parseObject(updatedJson.getString(i));
MaterialExtend materialExtend = new MaterialExtend();
materialExtend.setId(tempUpdatedJson.getLong("Id"));
if (StringUtils.isNotEmpty(tempUpdatedJson.getString("BarCode"))) {
materialExtend.setBarCode(tempUpdatedJson.getString("BarCode"));
}
if (StringUtils.isNotEmpty(tempUpdatedJson.getString("CommodityUnit"))) {
materialExtend.setCommodityUnit(tempUpdatedJson.getString("CommodityUnit"));
}
if (StringUtils.isNotEmpty(tempUpdatedJson.getString("PurchaseDecimal"))) {
materialExtend.setPurchaseDecimal(tempUpdatedJson.getBigDecimal("PurchaseDecimal"));
}
if (StringUtils.isNotEmpty(tempUpdatedJson.getString("CommodityDecimal"))) {
materialExtend.setCommodityDecimal(tempUpdatedJson.getBigDecimal("CommodityDecimal"));
}
if (StringUtils.isNotEmpty(tempUpdatedJson.getString("WholesaleDecimal"))) {
materialExtend.setWholesaleDecimal(tempUpdatedJson.getBigDecimal("WholesaleDecimal"));
}
if (StringUtils.isNotEmpty(tempUpdatedJson.getString("LowDecimal"))) {
materialExtend.setLowDecimal(tempUpdatedJson.getBigDecimal("LowDecimal"));
}
this.updateMaterialExtend(materialExtend, request);
}
}
return null;
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int insertMaterialExtend(MaterialExtend materialExtend)throws Exception {
User user = userService.getCurrentUser();
materialExtend.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS);
materialExtend.setCreateTime(new Date());
materialExtend.setUpdateTime(new Date().getTime());
materialExtend.setCreateSerial(user.getLoginame());
materialExtend.setUpdateSerial(user.getLoginame());
int result =0;
try{
result= materialExtendMapper.insertSelective(materialExtend);
}catch(Exception e){
JshException.writeFail(logger, e);
}
return result;
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateMaterialExtend(MaterialExtend MaterialExtend, HttpServletRequest request) throws Exception{
User user = userService.getCurrentUser();
MaterialExtend.setUpdateTime(new Date().getTime());
MaterialExtend.setUpdateSerial(user.getLoginame());
int res =0;
try{
res= materialExtendMapper.updateByPrimaryKeySelective(MaterialExtend);
}catch(Exception e){
JshException.writeFail(logger, e);
}
return res;
}
public int checkIsExist(Long id, String MaterialExtendName)throws Exception {
MaterialExtendExample example = new MaterialExtendExample();
MaterialExtendExample.Criteria criteria = example.createCriteria();
criteria.andBarCodeEqualTo(MaterialExtendName);
if (id > 0) {
criteria.andIdNotEqualTo(id);
}
List<MaterialExtend> list =null;
try{
list= materialExtendMapper.selectByExample(example);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list==null?0:list.size();
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int deleteMaterialExtend(Long id, HttpServletRequest request)throws Exception {
int result =0;
MaterialExtend materialExtend = new MaterialExtend();
materialExtend.setId(id);
materialExtend.setDeleteFlag(BusinessConstants.DELETE_FLAG_DELETED);
Object userInfo = request.getSession().getAttribute("user");
User user = (User)userInfo;
materialExtend.setUpdateTime(new Date().getTime());
materialExtend.setUpdateSerial(user.getLoginame());
try{
result= materialExtendMapper.updateByPrimaryKeySelective(materialExtend);
}catch(Exception e){
JshException.writeFail(logger, e);
}
return result;
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchDeleteMaterialExtendByIds(String ids, HttpServletRequest request) throws Exception{
logService.insertLog("商品价格扩展",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
String [] idArray=ids.split(",");
int result = 0;
try{
result = materialExtendMapperEx.batchDeleteMaterialExtendByIds(idArray);
}catch(Exception e){
JshException.writeFail(logger, e);
}
return result;
}
public int insertMaterialExtend(String beanJson, HttpServletRequest request) throws Exception{
MaterialExtend materialExtend = JSONObject.parseObject(beanJson, MaterialExtend.class);
int result=0;
try{
result = materialExtendMapper.insertSelective(materialExtend);
}catch(Exception e){
JshException.writeFail(logger, e);
}
return result;
}
public int updateMaterialExtend(String beanJson, Long id, HttpServletRequest request)throws Exception {
MaterialExtend materialExtend = JSONObject.parseObject(beanJson, MaterialExtend.class);
int result=0;
try{
result = materialExtendMapper.insertSelective(materialExtend);
}catch(Exception e){
JshException.writeFail(logger, e);
}
return result;
}
public List<MaterialExtend> getMaterialExtendByTenantAndTime(Long tenantId, Long lastTime, Long syncNum)throws Exception {
List<MaterialExtend> list=new ArrayList<MaterialExtend>();
try{
//先获取最大的时间戳，再查两个时间戳之间的数据，这样同步能够防止丢失数据（应为时间戳有重复）
Long maxTime = materialExtendMapperEx.getMaxTimeByTenantAndTime(tenantId, lastTime, syncNum);
if(tenantId!=null && lastTime!=null && maxTime!=null) {
MaterialExtendExample example = new MaterialExtendExample();
example.createCriteria().andTenantIdEqualTo(tenantId)
.andUpdateTimeGreaterThan(lastTime)
.andUpdateTimeLessThanOrEqualTo(maxTime);
list=materialExtendMapper.selectByExample(example);
}
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
/**
* 根据条码更新零售价
* @param retailPrice
* @param barCode
*/
public int updateRetailPriceByCode(BigDecimal retailPrice,String barCode) {
int result=0;
try{
MaterialExtend materialExtend = new MaterialExtend();
materialExtend.setCommodityDecimal(retailPrice);
MaterialExtendExample example = new MaterialExtendExample();
example.createCriteria().andBarCodeEqualTo(barCode);
result = materialExtendMapper.updateByExampleSelective(materialExtend, example);
}catch(Exception e){
JshException.writeFail(logger, e);
}
return result;
}
/**
* 根据条码更新进价
* @param purchasePrice
* @param barCode
*/
public int updatePurchasePriceByCode(BigDecimal purchasePrice,String barCode) {
int result=0;
try{
MaterialExtend materialExtend = new MaterialExtend();
materialExtend.setPurchaseDecimal(purchasePrice);
MaterialExtendExample example = new MaterialExtendExample();
example.createCriteria().andBarCodeEqualTo(barCode);
result = materialExtendMapper.updateByExampleSelective(materialExtend, example);
}catch(Exception e){
JshException.writeFail(logger, e);
}
return result;
}
/**
* 根据条码更新进价
* @param barCode
* @param barCode
*/
public MaterialExtend getMaterialExtendByBarCode(String barCode) {
MaterialExtend me = new MaterialExtend();
try{
MaterialExtendExample example = new MaterialExtendExample();
example.createCriteria().andBarCodeEqualTo(barCode);
List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
if(list!=null && list.size()>0) {
me = list.get(0);
}
}catch(Exception e){
JshException.readFail(logger, e);
}
return me;
}
}

26
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -13,6 +13,7 @@ import com.jsh.erp.datasource.vo.DepotItemStockWarningCount;
import com.jsh.erp.datasource.vo.DepotItemVo4Stock;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.MaterialExtend.MaterialExtendService;
import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.material.MaterialService;
import com.jsh.erp.service.serialNumber.SerialNumberService;
@@ -49,6 +50,8 @@ public class DepotItemService {
@Resource
private MaterialService materialService;
@Resource
private MaterialExtendService materialExtendService;
@Resource
SerialNumberMapperEx serialNumberMapperEx;
@Resource
private DepotHeadMapper depotHeadMapper;
@@ -349,20 +352,18 @@ public class DepotItemService {
DepotItem depotItem = new DepotItem();
JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
depotItem.setHeaderid(headerId);
depotItem.setMaterialid(tempInsertedJson.getLong("MaterialId"));
Long materialExtendId = tempInsertedJson.getLong("MaterialExtendId");
Long materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId();
depotItem.setMaterialid(materialId);
depotItem.setMaterialExtendId(tempInsertedJson.getLong("MaterialExtendId"));
depotItem.setMunit(tempInsertedJson.getString("Unit"));
if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) {
depotItem.setOpernumber(tempInsertedJson.getBigDecimal("OperNumber"));
try {
String Unit = tempInsertedJson.get("Unit").toString();
BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber");
Long mId = Long.parseLong(tempInsertedJson.get("MaterialId").toString());
/***
* 为什么调用的方法要先把基础单位去掉，去掉之后后续还能获取到？
* */
//以下进行单位换算
// String UnitName = findUnitName(mId); //查询计量单位名称
String unitName = materialService.findUnitName(mId);
String unitName = materialService.findUnitName(materialId); //查询计量单位名称
if (!StringUtil.isEmpty(unitName)) {
String unitList = unitName.substring(0, unitName.indexOf("("));
String ratioList = unitName.substring(unitName.indexOf("("));
@@ -484,7 +485,13 @@ public class DepotItemService {
this.updateDepotItemWithObj(depotItem);
}
depotItem.setId(tempUpdatedJson.getLong("Id"));
depotItem.setMaterialid(tempUpdatedJson.getLong("MaterialId"));
Long materialId = null;
if (StringUtil.isExist(tempUpdatedJson.get("MaterialExtendId"))) {
Long materialExtendId = tempUpdatedJson.getLong("MaterialExtendId");
materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId();
depotItem.setMaterialid(materialId);
depotItem.setMaterialExtendId(tempUpdatedJson.getLong("MaterialExtendId"));
}
depotItem.setMunit(tempUpdatedJson.getString("Unit"));
if (!StringUtil.isEmpty(tempUpdatedJson.get("OperNumber").toString())) {
depotItem.setOpernumber(tempUpdatedJson.getBigDecimal("OperNumber"));
@@ -493,8 +500,7 @@ public class DepotItemService {
BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber");
Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString());
//以下进行单位换算
// String UnitName = findUnitName(mId); //查询计量单位名称
String unitName = materialService.findUnitName(mId);
String unitName = materialService.findUnitName(mId); //查询计量单位名称
if (!StringUtil.isEmpty(unitName)) {
String unitList = unitName.substring(0, unitName.indexOf("("));
String ratioList = unitName.substring(unitName.indexOf("("));

7
src/main/java/com/jsh/erp/service/material/MaterialComponent.java
View File

@@ -33,21 +33,22 @@ public class MaterialComponent implements ICommonQuery {
private List<?> getMaterialList(Map<String, String> map) throws Exception{
String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name");
String standard = StringUtil.getInfo(search, "standard");
String model = StringUtil.getInfo(search, "model");
String categoryIds = StringUtil.getInfo(search, "categoryIds");
String mpList = StringUtil.getInfo(search, "mpList");
String order = QueryUtils.order(map);
return materialService.select(name, model,categoryIds,mpList, QueryUtils.offset(map), QueryUtils.rows(map));
return materialService.select(name, standard, model,categoryIds,mpList, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override
public Long counts(Map<String, String> map)throws Exception {
String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name");
String standard = StringUtil.getInfo(search, "standard");
String model = StringUtil.getInfo(search, "model");
String categoryIds = StringUtil.getInfo(search, "categoryIds");
String mpList = StringUtil.getInfo(search, "mpList");
return materialService.countMaterial(name, model,categoryIds,mpList);
return materialService.countMaterial(name, standard, model,categoryIds,mpList);
}
@Override

112
src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -13,6 +13,7 @@ import com.jsh.erp.datasource.mappers.MaterialMapperEx;
import com.jsh.erp.datasource.mappers.MaterialStockMapper;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.MaterialExtend.MaterialExtendService;
import com.jsh.erp.service.depot.DepotService;
import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.log.LogService;
@@ -59,6 +60,8 @@ public class MaterialService {
private MaterialStockMapper materialStockMapper;
@Resource
private DepotService depotService;
@Resource
private MaterialExtendService materialExtendService;
public Material getMaterial(long id)throws Exception {
Material result=null;
@@ -82,27 +85,26 @@ public class MaterialService {
return list;
}
public List<MaterialVo4Unit> select(String name, String model, String categoryIds,String mpList, int offset, int rows)
public List<MaterialVo4Unit> select(String name, String standard, String model, String categoryIds,String mpList, int offset, int rows)
throws Exception{
String[] mpArr = mpList.split(",");
List<MaterialVo4Unit> resList = new ArrayList<MaterialVo4Unit>();
List<MaterialVo4Unit> list =null;
try{
list= materialMapperEx.selectByConditionMaterial(name, model,categoryIds,mpList, offset, rows);
list= materialMapperEx.selectByConditionMaterial(name, standard, model, categoryIds, mpList, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
if (null != list) {
List<Long> idList = new ArrayList<Long>();
for (MaterialVo4Unit m : list) {
idList.add(m.getId());
}
List<MaterialExtend> meList = materialExtendService.getListByMIds(idList);
for (MaterialVo4Unit m : list) {
//扩展信息
String materialOther = "";
for (int i = 0; i < mpArr.length; i++) {
if (mpArr[i].equals("颜色")) {
materialOther = materialOther + ((m.getColor() == null || m.getColor().equals("")) ? "" : "(" + m.getColor() + ")");
}
if (mpArr[i].equals("规格")) {
materialOther = materialOther + ((m.getStandard() == null || m.getStandard().equals("")) ? "" : "(" + m.getStandard() + ")");
}
if (mpArr[i].equals("制造商")) {
materialOther = materialOther + ((m.getMfrs() == null || m.getMfrs().equals("")) ? "" : "(" + m.getMfrs() + ")");
}
@@ -119,16 +121,24 @@ public class MaterialService {
m.setMaterialOther(materialOther);
Long tenantId = m.getTenantId();
m.setStock(depotItemService.getStockByParam(null,m.getId(),null,null,tenantId));
for(MaterialExtend me:meList) {
if(me.getMaterialId().longValue() == m.getId().longValue()) {
m.setPurchaseDecimal(me.getPurchaseDecimal()); //采购价
m.setCommodityDecimal(me.getCommodityDecimal()); //零售价
m.setWholesaleDecimal(me.getWholesaleDecimal()); //销售价
m.setLowDecimal(me.getLowDecimal()); //最低售价
}
}
resList.add(m);
}
}
return resList;
}
public Long countMaterial(String name, String model, String categoryIds,String mpList)throws Exception {
public Long countMaterial(String name, String standard, String model, String categoryIds,String mpList)throws Exception {
Long result =null;
try{
result= materialMapperEx.countsByMaterial(name, model,categoryIds,mpList);
result= materialMapperEx.countsByMaterial(name, standard, model, categoryIds, mpList);
}catch(Exception e){
JshException.readFail(logger, e);
}
@@ -137,13 +147,18 @@ public class MaterialService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int insertMaterial(String beanJson, HttpServletRequest request)throws Exception {
Material material = JSONObject.parseObject(beanJson, Material.class);
material.setEnabled(true);
int result =0;
Material m = JSONObject.parseObject(beanJson, Material.class);
m.setEnabled(true);
try{
result= materialMapper.insertSelective(material);
Long mId = null;
materialMapper.insertSelective(m);
List<Material> materials = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),
m.getStandard(), m.getMfrs(),m.getUnit(),m.getUnitid());
if(materials!=null && materials.size()>0) {
mId = materials.get(0).getId();
}
JSONObject mObj = JSON.parseObject(beanJson);
Long mId = material.getId();
materialExtendService.saveDetials(mObj.getString("inserted"), mObj.getString("deleted"), mObj.getString("updated"), mId);
if(mObj.get("stock")!=null) {
String stockStr = mObj.getString("stock");
JSONArray stockArr = JSONArray.parseArray(stockStr);
@@ -159,19 +174,19 @@ public class MaterialService {
}
}
logService.insertLog("商品", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
return 1;
}catch(Exception e){
JshException.writeFail(logger, e);
return 0;
}
return result;
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateMaterial(String beanJson, Long id, HttpServletRequest request) throws Exception{
Material material = JSONObject.parseObject(beanJson, Material.class);
material.setId(id);
int res =0;
try{
res= materialMapper.updateByPrimaryKeySelective(material);
materialMapper.updateByPrimaryKeySelective(material);
Long unitId = material.getUnitid();
if(unitId != null) {
materialMapperEx.updatePriceNullByPrimaryKey(id); //将价格置空
@@ -179,6 +194,7 @@ public class MaterialService {
materialMapperEx.updateUnitIdNullByPrimaryKey(id); //将多单位置空
}
JSONObject mObj = JSON.parseObject(beanJson);
materialExtendService.saveDetials(mObj.getString("inserted"),mObj.getString("deleted"),mObj.getString("updated"),id);
if(mObj.get("stock")!=null) {
String stockStr = mObj.getString("stock");
JSONArray stockArr = JSONArray.parseArray(stockStr);
@@ -199,11 +215,11 @@ public class MaterialService {
}
logService.insertLog("商品",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), request);
return 1;
}catch(Exception e){
JshException.writeFail(logger, e);
return 0;
}
return res;
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
@@ -310,6 +326,16 @@ public class MaterialService {
return list;
}
public List<MaterialVo4Unit> findByIdWithBarCode(Long meId)throws Exception{
List<MaterialVo4Unit> list =null;
try{
list= materialMapperEx.findByIdWithBarCode(meId);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public List<MaterialVo4Unit> findBySelect()throws Exception{
List<MaterialVo4Unit> list =null;
try{
@@ -333,6 +359,29 @@ public class MaterialService {
return list;
}
public List<MaterialVo4Unit> findBySelectWithBarCode(String q,Integer offset, Integer rows)throws Exception{
List<MaterialVo4Unit> list =null;
try{
list= materialMapperEx.findBySelectWithBarCode(q, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public int findBySelectWithBarCodeCount(String q)throws Exception{
int result=0;
try{
result = materialMapperEx.findBySelectWithBarCodeCount(q);
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE,
ExceptionConstants.DATA_READ_FAIL_MSG);
}
return result;
}
public List<MaterialVo4Unit> findByAll(String name, String model, String categoryIds)throws Exception {
List<MaterialVo4Unit> resList = new ArrayList<MaterialVo4Unit>();
List<MaterialVo4Unit> list =null;
@@ -442,8 +491,12 @@ public class MaterialService {
List<Material> materials = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),m.getStandard(),
m.getMfrs(),m.getUnit(),m.getUnitid());
if(materials.size()<=0) {
materialMapperEx.insertSelectiveEx(m);
mId = m.getId();
materialMapper.insertSelective(m);
List<Material> newList = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),m.getStandard(),
m.getMfrs(),m.getUnit(),m.getUnitid());
if(newList!=null && newList.size()>0) {
mId = newList.get(0).getId();
}
} else {
mId = materials.get(0).getId();
String materialJson = JSON.toJSONString(m);
@@ -658,4 +711,19 @@ public class MaterialService {
}
return stock;
}
public List<MaterialVo4Unit> getMaterialByMeId(long meId) {
List<MaterialVo4Unit> result = new ArrayList<MaterialVo4Unit>();
try{
result= materialMapperEx.getMaterialByMeId(meId);
}catch(Exception e){
JshException.readFail(logger, e);
}
return result;
}
public String getMaxBarCode() {
String maxBarCodeOld = materialMapperEx.getMaxBarCode();
return Long.parseLong(maxBarCodeOld)+"";
}
}

20
src/main/java/com/jsh/erp/utils/StringUtil.java
View File

@@ -148,6 +148,13 @@ public class StringUtil {
return new String[0];
}
public static Long[] listToLongArray(List<Long> list) {
if (list != null && !list.isEmpty()) {
return list.toArray(new Long[list.size()]);
}
return new Long[0];
}
public static List<String> stringToListArray(String[] strings) {
if (strings != null && strings.length > 0) {
return Arrays.asList(strings);
@@ -223,6 +230,19 @@ public class StringUtil {
return value;
}
public static boolean isExist(Object value) {
if(value!=null) {
String str = value.toString();
if("".equals(str.trim())) {
return false;
} else {
return true;
}
} else {
return false;
}
}
public static void main(String[] args) {
int i = 10/3;
System.out.println(i);