Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
zhaoxiaolin 11 months ago
parent abc649aef4 9340ef8a3d
commit 24d8b7c6a1
4 changed files with 192 additions and 40 deletions
Show Stats Download Patch File Download Diff File

99
op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java
Unescape Escape View File

@ -31,6 +31,17 @@ public class OdsProcureOrder extends BaseEntity {
* 已登记数量
*/
// 托盘数量
private BigDecimal palletNum;
public BigDecimal getPalletNum() {
return palletNum;
}
public void setPalletNum(BigDecimal palletNum) {
this.palletNum = palletNum;
}
private BigDecimal operationNumber;
private BigDecimal czNumber;
@ -238,9 +249,9 @@ public class OdsProcureOrder extends BaseEntity {
private String userDefined4;
/**
* 用户自定义属性5
* 送货单号
*/
@Excel(name = "用户自定义属性5")
@Excel(name = "送货单号")
private String userDefined5;
/**
@ -639,38 +650,56 @@ public class OdsProcureOrder extends BaseEntity {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("siteCode", getSiteCode())
.append("ID", getID())
.append("procureCode", getProcureCode())
.append("materialCode", getMaterialCode())
.append("materialDesc", getMaterialDesc())
.append("planDate", getPlanDate())
.append("planNumber", getPlanNumber())
.append("Unit", getUnit())
.append("realityNumber", getRealityNumber())
.append("orderStatus", getOrderStatus())
.append("userDefined1", getUserDefined1())
.append("userDefined2", getUserDefined2())
.append("userDefined3", getUserDefined3())
.append("userDefined4", getUserDefined4())
.append("userDefined5", getUserDefined5())
.append("userDefined6", getUserDefined6())
.append("userDefined7", getUserDefined7())
.append("userDefined8", getUserDefined8())
.append("userDefined9", getUserDefined9())
.append("userDefined10", getUserDefined10())
.append("userDefined11", getUserDefined11())
.append("supplierCode", getSupplierCode())
.append("supplierName", getSupplierName())
.append("Remark", getRemark())
.append("createBy", getCreateBy())
.append("createDate", getCreateDate())
.append("lastUpdateBy", getLastUpdateBy())
.append("lastUpdateDate", getLastUpdateDate())
.append("Active", getActive())
.append("enterpriseId", getEnterpriseId())
.append("enterpriseCode", getEnterpriseCode())
.toString();
return "OdsProcureOrder{" +
"ID='" + ID + '\'' +
", factoryCode='" + factoryCode + '\'' +
", list=" + list +
", palletNum=" + palletNum +
", operationNumber=" + operationNumber +
", czNumber=" + czNumber +
", siteCode='" + siteCode + '\'' +
", cardNum='" + cardNum + '\'' +
", whCode='" + whCode + '\'' +
", waCode='" + waCode + '\'' +
", sn='" + sn + '\'' +
", poLine='" + poLine + '\'' +
", procureCode='" + procureCode + '\'' +
", receiptNoCode='" + receiptNoCode + '\'' +
", materialCode='" + materialCode + '\'' +
", incomeBatchNo='" + incomeBatchNo + '\'' +
", materialDesc='" + materialDesc + '\'' +
", planDate=" + planDate +
", planNumber=" + planNumber +
", buNumber=" + buNumber +
", Unit='" + Unit + '\'' +
", realityNumber=" + realityNumber +
", orderStatus='" + orderStatus + '\'' +
", userDefined1='" + userDefined1 + '\'' +
", userDefined2='" + userDefined2 + '\'' +
", userDefined3='" + userDefined3 + '\'' +
", userDefined4='" + userDefined4 + '\'' +
", userDefined5='" + userDefined5 + '\'' +
", userDefined6='" + userDefined6 + '\'' +
", userDefined7='" + userDefined7 + '\'' +
", userDefined8='" + userDefined8 + '\'' +
", userDefined9='" + userDefined9 + '\'' +
", userDefined10='" + userDefined10 + '\'' +
", userDefined11='" + userDefined11 + '\'' +
", supplierCode='" + supplierCode + '\'' +
", Remark='" + Remark + '\'' +
", supplierName='" + supplierName + '\'' +
", createDate=" + createDate +
", lastUpdateBy='" + lastUpdateBy + '\'' +
", lastUpdateDate=" + lastUpdateDate +
", lastUpdateDateMIN=" + lastUpdateDateMIN +
", lastUpdateDateMAX=" + lastUpdateDateMAX +
", Active='" + Active + '\'' +
", enterpriseId='" + enterpriseId + '\'' +
", enterpriseCode='" + enterpriseCode + '\'' +
", SapTempInfor='" + SapTempInfor + '\'' +
", SapTempStatus='" + SapTempStatus + '\'' +
", SAPstatus='" + SAPstatus + '\'' +
", SAPmessage='" + SAPmessage + '\'' +
'}';
}
}

8
op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java
Unescape Escape View File

@ -81,4 +81,12 @@ public interface OdsProcureOrderMapper {
void updateodsProcureOrderCard(OdsProcureOrder order1);
OdsProcureOrder selectOdsProcureOrderByIDAndSap(String id);
/**
* 查询包材采购单列表
*
* @param odsProcureOrder 包材采购单
* @return 包材采购单集合
*/
public List<OdsProcureOrder> selectOdsProcureOrderList1(OdsProcureOrder odsProcureOrder);
}

10
op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
Unescape Escape View File

@ -108,10 +108,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
@Override
@DS("#header.poolName")
public List<OdsProcureOrder> selectOdsProcureOrderList(OdsProcureOrder odsProcureOrder) {
List<OdsProcureOrder> orderList= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder);
List<OdsProcureOrder> orderList= odsProcureOrderMapper.selectOdsProcureOrderList1(odsProcureOrder);
for (OdsProcureOrder order:
orderList) {
String name = odsProcureOrderMapper.selectBaseSupplier(order);
String name = odsProcureOrderMapper.selectBaseSupplier(order);
order.setSupplierName(name);
}
return orderList;
@ -971,7 +971,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
//这个地方判断下是不是采购单已经被插入了，如果是的话，并且是走的送货单的路径，那就把送货单给她附上
continue;
}
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
Date date = new Date();
String formattedDate = dateFormat.format(date);
order.setUserDefined7(formattedDate+order.getUserDefined3());
@ -1454,6 +1454,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
}
}
public String dayin( List<OdsProcureOrder> orderList) {
// 定义请求的URL地址
String url = dayinUrl1;
@ -1820,4 +1822,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
return null;
}
}

115
op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
Unescape Escape View File

@ -39,11 +39,45 @@
<result property="enterpriseCode" column="Enterprise_Code"/>
<result property="operationNumber" column="Operation_Number"/>
<result property="sn" column="sn"/>
<result property="palletNum" column="pallet_num"/>
</resultMap>
<sql id="selectOdsProcureOrderVo">
select Site_code, ID, Procure_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit,COALESCE(Reality_Number, 0) Reality_Number, Order_Status, User_Defined1, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Supplier_Code, Supplier_Name, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, COALESCE(Operation_Number, 0) Operation_Number from ods_procure_order
</sql>
SELECT
Site_code,
ID,
Procure_Code,
Material_Code,
Material_Desc,
Plan_Date,
Plan_Number,
Unit,
COALESCE ( Reality_Number, 0 ) Reality_Number,
Order_Status,
User_Defined1,
User_Defined2,
User_Defined3,
User_Defined4,
User_Defined5,
User_Defined6,
User_Defined7,
User_Defined8,
User_Defined9,
User_Defined10,
User_Defined11,
Supplier_Code,
Supplier_Name,
Remark,
Create_By,
Create_Date,
Last_Update_By,
Last_Update_Date,
Active,
Enterprise_Id,
Enterprise_Code,
base_product_attached.pallet_num, COALESCE ( Operation_Number, 0 ) Operation_Number
FROM
ods_procure_orde</sql>
<select id="selectOdsProcureOrderList" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
<include refid="selectOdsProcureOrderVo"/>
@ -82,6 +116,7 @@
<if test="Active != null and Active != ''">and Active = #{Active}</if>
<if test="enterpriseId != null and enterpriseId != ''">and Enterprise_Id = #{enterpriseId}</if>
<if test="enterpriseCode != null and enterpriseCode != ''">and Enterprise_Code = #{enterpriseCode}</if>
<if test="palletNum != null and palletNum != ''">and pallet_num = #{palletNum}</if>
</where>
order by Create_Date desc
</select>
@ -458,6 +493,82 @@
WHERE
card.User_Defined1= #{userDefined1}
</select>
<select id="selectOdsProcureOrderList1" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
SELECT
o.Site_code,
o.ID,
o.Procure_Code,
o.Material_Code,
o.Material_Desc,
o.Plan_Date,
o.Plan_Number,
o.Unit,
COALESCE ( Reality_Number, 0 ) Reality_Number,
o.Order_Status,
o.User_Defined1,
o.User_Defined2,
o.User_Defined3,
o.User_Defined4,
o.User_Defined5,
o.User_Defined6,
o.User_Defined7,
o.User_Defined8,
o.User_Defined9,
o.User_Defined10,
o.User_Defined11,
o.Supplier_Code,
o.Supplier_Name,
o.Remark,
o.Create_By,
o.Create_Date,
o.Last_Update_By,
o.Last_Update_Date,
o.Active,
o.Enterprise_Id,
o.Enterprise_Code,
base_product_attached.pallet_num, COALESCE ( Operation_Number, 0 ) Operation_Number
FROM
ods_procure_order as o LEFT JOIN base_product_attached
on o.Material_Code = '0000000'+base_product_attached.product_code
<where>
<if test="siteCode != null and siteCode != ''">and o.Site_code = #{siteCode}</if>
<if test="ID != null and ID != ''">and o.ID = #{ID}</if>
<if test="procureCode != null and procureCode != ''">and o.Procure_Code = #{procureCode}</if>
<if test="materialCode != null and materialCode != ''">and o.Material_Code like concat('%', #{materialCode},
'%') </if>
<if test="materialDesc != null and materialDesc != ''">and o.Material_Desc = #{materialDesc}</if>
<if test="planDate != null ">and o.Plan_Date = #{planDate}</if>
<if test="planNumber != null ">and o.Plan_Number = #{planNumber}</if>
<if test="Unit != null and Unit != ''">and o.Unit = #{Unit}</if>
<if test="realityNumber != null ">and o.Reality_Number = #{realityNumber}</if>
<if test="orderStatus != null and orderStatus != ''">and o.Order_Status = #{orderStatus}</if>
<if test="userDefined1 != null and userDefined1 != ''">and o.User_Defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''">and o.User_Defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''">and o.User_Defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''">and o.User_Defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''">and o.User_Defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''">and o.User_Defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''">and o.User_Defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''">and o.User_Defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''">and o.User_Defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''">and o.User_Defined10 = #{userDefined10}</if>
<if test="userDefined11 != null and userDefined11 != ''">and o.User_Defined11 = #{userDefined11}</if>
<if test="supplierCode != null and supplierCode != ''">and o.Supplier_Code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''">and o.Supplier_Name like concat('%', #{supplierName},
'%')
</if>
<if test="Remark != null and Remark != ''">and o.Remark = #{Remark}</if>
<if test="createBy != null and createBy != ''">and o.Create_By = #{createBy}</if>
<if test="createDate != null ">and o.Create_Date = #{createDate}</if>
<if test="lastUpdateBy != null and lastUpdateBy != ''">and o.Last_Update_By = #{lastUpdateBy}</if>
<if test="lastUpdateDate != null ">and o.Last_Update_Date = #{lastUpdateDate}</if>
<if test="Active != null and Active != ''">and o.Active = #{Active}</if>
<if test="enterpriseId != null and enterpriseId != ''">and o.Enterprise_Id = #{enterpriseId}</if>
<if test="enterpriseCode != null and enterpriseCode != ''">and o.Enterprise_Code = #{enterpriseCode}</if>
<if test="palletNum != null and palletNum != ''">and pallet_num = #{palletNum}</if>
</where>
order by Create_Date desc
</select>
<update id="updateodsProcureOrderCard">
update ods_procure_order_card
SET User_Defined10 = '1'

Write Preview
Loading…
Cancel
Save