成本分配表 事故单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/entity/SyCostAllocationAccident.java

@@ -72,10 +72,23 @@ public class SyCostAllocationAccident implements Serializable {
     @ApiModelProperty(value = "金额")
     private java.math.BigDecimal amount;
 
-    /**人民币金额*/
-    @Excel(name = "人民币金额", width = 15)
-    @ApiModelProperty(value = "人民币金额")
-    private java.math.BigDecimal rmbamount;
+    /**币种*/
+    @Excel(name = "币种", width = 15)
+    @ApiModelProperty(value = "币种")
+    private String moneyType;
+
+    private String accidentNumber;
+    private String responsibilityPerson1;
+    private String accidentData;
+    private String customer;
+    private String styleNumber;
+    private String planNumber;
+    private String planPersonnel;
+    private String businessPeople;
+    private String garmentSalesOrder;
+    private String material;
+    private String qualityControl;
+    private String financeRemark;
 
     /**加工单位*/
     @Excel(name = "加工单位", width = 15)

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/SyCostAllocationAccidentMapper.java

@@ -18,6 +18,6 @@ public interface SyCostAllocationAccidentMapper extends BaseMapper<SyCostAllocat
     
 	public List<SyCostAllocationAccident> selectByMainId(String mainId);
 
-	@DS("multi-three")
+	@DS("multi-oa")
 	List<SyCostAllocationAccident> queryByCostAccident(String code);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationAccidentMapper.xml

@@ -17,7 +17,16 @@
 	</select>
 
 	<select id="queryByCostAccident" resultType="org.jeecg.modules.cost.entity.SyCostAllocationAccident">
-		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
+		select
+			its.u8_invoice as accidentNum,its.accident_sum as amount,its.money_type,it.accident_number,it.responsibility_person1,
+			it.accident_data,it.factory as accidentUndertaker,it.customer,it.style_number,its.plan_number,it.plan_personnel,
+			it.business_people,it.garment_sales_order,material,it.quality_control,finance_remark
+		from incident_ticket it
+		join incident_ticket_children its on it.id=its.incident_ticket_id
+		where its.plan_number = 'SYE228'
+	</select>
+	<!--
+	SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
 					from UFDATA_101_2021.dbo.PurBillVouchs a
 					left join UFDATA_101_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
 					left join UFDATA_101_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
@@ -47,5 +56,5 @@
 					where cPBVBillType='03'
 					 and inv.cInvName='事故单'  and ah.cDefine2 like CONCAT(#{code},'%')
 					group by ah.cPBVCode,ven.cVenAbbName,ah.cDefine2;
-	</select>
+	-->
 </mapper>

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -156,6 +156,11 @@ spring:
           username: sa
           password: Windows2008R2
           driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-oa:
+          url: jdbc:mysql://192.168.1.158:3306/cd_work_flow_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: root
+          driver-class-name: com.mysql.cj.jdbc.Driver
   #        multi-two:
   #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_102_2021
   #          username: sa