Browse Source

24-03-06 生产打印标签

master
zelian_wu 2 years ago
parent
commit
ae1f9fd1d6
  1. 7
      src/main/java/com/heai/modules/board/controller/BoardController.java
  2. 7
      src/main/java/com/heai/modules/board/dao/BoardMapper.java
  3. 12
      src/main/java/com/heai/modules/board/service/BoardService.java
  4. 50
      src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
  5. 29
      src/main/java/com/heai/modules/production/entity/PackagePrintData.java
  6. 40
      src/main/resources/mapper/board/BoardMapper.xml

7
src/main/java/com/heai/modules/board/controller/BoardController.java

@ -12,6 +12,7 @@ import com.heai.modules.taskmanage.vo.TaskListVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -306,6 +307,12 @@ public class BoardController {
List<StockPrintData> resultList4 = boardService.getStockPrintListCaiGou(ip);
return R.ok().put("rows", resultList).put("rows2", resultList2).put("rows3", resultList3).put("rows4", resultList4);
}
@GetMapping("/getPackagePrintDataList")
public R getPackagePrintDataList(Integer previousSeqNo, BigDecimal number, String site, String orderNo){
List<PackagePrintData> list = boardService.getPackagePrintDataList(previousSeqNo, number, site, orderNo);
return R.ok().put("rows",list);
}
/**
* @Description TODO
* @Title getStockPrintList

7
src/main/java/com/heai/modules/board/dao/BoardMapper.java

@ -7,8 +7,10 @@ import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Mapper
public interface BoardMapper {
@ -158,6 +160,7 @@ public interface BoardMapper {
* @throw
*/
List<PackagePrintData> getPackagePrintData(String ip);
List<PackagePrintData> getPackagePrintDataList(@Param("seqNo") Integer seqNo, @Param("number") BigDecimal number);
/**
* @Description TODO
* @Title getStockPrintOutBox
@ -208,4 +211,8 @@ public interface BoardMapper {
* @throw
*/
BIBoardAddressData searchBIBoardAddress(BIBoardAddressData inData);
Map<String, String> getCustomerInfo(@Param("site") String site,@Param("orderNo") String orderNo);
String getWorkCenterProLineNo(@Param("site")String site, @Param("workCenterNo")String workCenterNo);
}

12
src/main/java/com/heai/modules/board/service/BoardService.java

@ -6,7 +6,9 @@ import com.heai.modules.board.entity.ViewKanbanCODelNotifyData;
import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData;
import com.heai.modules.production.entity.*;
import com.heai.modules.taskmanage.vo.TaskListVo;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@ -247,4 +249,14 @@ public interface BoardService {
* @throw
*/
BIBoardAddressData searchBIBoardAddress(BIBoardAddressData inData);
/**
* 打印标签
* @param previousSeqNo
* @param number
* @param site
* @param orderNo
* @return
*/
List<PackagePrintData> getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo);
}

50
src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java

@ -16,8 +16,10 @@ import com.heai.modules.taskmanage.vo.TaskDetailVo;
import com.heai.modules.taskmanage.vo.TaskListVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.print.attribute.standard.PrinterInfo;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@ -562,4 +564,52 @@ public class BoardServiceImpl implements BoardService {
return boardMapper.searchBIBoardAddress(inData);
}
@Override
public List<PackagePrintData> getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo) {
// 1上一道工序
if (StringUtils.isEmpty(site)){
throw new RuntimeException("参数Site为空");
}
if (StringUtils.isEmpty(orderNo)){
throw new RuntimeException("参数orderNo为空");
}
// 2返回集合
List<PackagePrintData> list = boardMapper.getPackagePrintDataList(previousSeqNo,number);
if (list.isEmpty()){
throw new RuntimeException("派工单未查询到标签信息");
}
PackagePrintData packagePrintData = list.get(0);
String workCenterProLine = boardMapper.getWorkCenterProLineNo(packagePrintData.getSite(),packagePrintData.getWorkCenterNo());
if (!"PACKING".equals(workCenterProLine)){
throw new RuntimeException("该派工单工序不是包装工序");
}
if (Objects.nonNull(number)){
packagePrintData.setUnitQty(number.doubleValue());
}
Map<String,String> map = boardMapper.getCustomerInfo(site,orderNo);
System.out.println(map);
if ("TBC".equals(map.get("CustomerGroup"))){
packagePrintData.setKeyInfoStr1(map.get("LogoFileName"));
packagePrintData.setKeyInfoStr1(map.get("CustomerDesc"));
}else {
packagePrintData.setKeyInfoStr1("AMLogo.jpg");
packagePrintData.setKeyInfoStr1("A&M Polymer");
}
switch (map.get("ABC")){
case "A":
packagePrintData.setCode("CODE39");
break;
case "B":
case "C":
packagePrintData.setCode("CODE128");
break;
default:
packagePrintData.setCode("CODEXX");
break;
}
// 参数赋值
List<PackagePrintData> resultList = new ArrayList<>();
resultList.add(packagePrintData);
return resultList;
}
}

29
src/main/java/com/heai/modules/production/entity/PackagePrintData.java

@ -31,6 +31,35 @@ public class PackagePrintData {
private String keyInfoStr1;
private String keyInfoStr2;
private String code;
private String workCenterNo;
private String site;
public String getSite() {
return site;
}
public void setSite(String site) {
this.site = site;
}
public String getWorkCenterNo() {
return workCenterNo;
}
public void setWorkCenterNo(String workCenterNo) {
this.workCenterNo = workCenterNo;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public Integer getId() {
return id;

40
src/main/resources/mapper/board/BoardMapper.xml

@ -306,5 +306,45 @@
<select id="searchBIBoardAddress" resultType="BIBoardAddressData">
select address from BIBoardAddress where reportId=#{reportId}
</select>
<select id="getPackagePrintDataList" resultType="com.heai.modules.production.entity.PackagePrintData">
Select
SO.PartNo,dbo.Get_PartDesc(T.Site,SO.PartNo) as PartDesc,
dbo.Get_Part_Spec(T.Site,SO.PartNo) as PartSpec,
dbo.Get_Part_UMID(T.Site,SO.PartNo) as umid ,T.WorkCenterNo,T.Site,
T.AssJobSeqNo as SeqNo,
T.Remark,CH.CustomerPONo as OrderRef4,
Convert(Datetime,Convert(Integer,Convert(Float,T.StatisticDate))) as ReceiveDate,
isnull((Select OurVendorCode from Customer as C Where C.Site=CH.Site and C.CustomerID=CH.CustomerID),'') as SiteName,
t.OrderNo as BatchNo,
T.OperatorID as Inspector,
s1.Address_E as siteAdress ,
'Phone:'+s1.PhoneNo+' Email:'+s1.Email as sitePhone,
1 as printQty,
convert(varchar(100),isnull(V.TextValue,'')) as bilNote
from SFDC as T
,ShopOrder as SO
Left Join COHeader as CH On CH.Site=SO.Site and CH.OrderNo=SO.OrderRef1
left join site s1 on s1.SiteID=SO.Site,Part as P
Left Join PartSubPropertiesValue as V
On P.Site=V.Site and P.PartNo=V.PartNo and P.CodeNo=V.CodeNo and V.SubCodeSeqNo=1 and V.RecordType='P' and V.PropertiesItemNo='BILNOTE'
,Site as S
Where T.Site=S.SiteID and T.Site=SO.Site and T.OrderNo=SO.OrderNo
and SO.Site=P.Site and SO.PartNo=P.PartNo and t.SeqNo = #{seqNo,jdbcType=INTEGER}
</select>
<select id="getCustomerInfo" resultType="java.util.HashMap">
Select isnull((Select C.CustomerGroup from Customer as C Where C.Site=CH.Site and C.CustomerID=CH.CustomerID),'') as CustomerGroup,
isnull((Select C.ABC from Customer as C Where C.Site=CH.Site and C.CustomerID=CH.CustomerID),'') as ABC,
isnull((Select C.ShortCustomerName from Customer as C Where C.Site=CH.Site and C.CustomerID=CH.CustomerID),'') as CustomerDesc,
isnull((Select C.LogoFileName from Customer as C Where C.Site=CH.Site and C.CustomerID=CH.CustomerID),'') as LogoFileName
from ShopOrder as SO
Left Join COHeader as CH On CH.Site=SO.Site and CH.OrderNo=SO.OrderRef1
Where SO.Site = #{site} and SO.OrderNo = #{orderNo}
</select>
<select id="getWorkCenterProLineNo" resultType="java.lang.String">
select dbo.Get_WorkCenter_ProLineNo(#{site},#{workCenterNo})
</select>
</mapper>
Loading…
Cancel
Save